diff --git a/ui/TelloWidget.ui b/ui/TelloWidget.ui
index c50048f3..a0359baa 100644
--- a/ui/TelloWidget.ui
+++ b/ui/TelloWidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Create3Widget</class>
- <widget class="QWidget" name="Create3Widget">
+ <class>TelloWidget</class>
+ <widget class="QWidget" name="TelloWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -23,7 +23,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <layout class="QHBoxLayout" name="connectDisconnectHorizontal">
         <property name="spacing">
          <number>10</number>
         </property>
@@ -44,7 +44,7 @@
           <property name="minimumSize">
            <size>
             <width>1</width>
-            <height>80</height>
+            <height>60</height>
            </size>
           </property>
           <property name="maximumSize">
@@ -77,7 +77,7 @@
           <property name="minimumSize">
            <size>
             <width>1</width>
-            <height>80</height>
+            <height>60</height>
            </size>
           </property>
           <property name="maximumSize">
@@ -99,11 +99,14 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="CreateConnectHorizontal">
+       <layout class="QHBoxLayout" name="telloControls">
+        <property name="spacing">
+         <number>51</number>
+        </property>
         <item>
-         <layout class="QGridLayout" name="gridLayout_2">
+         <layout class="QGridLayout" name="leftGrid">
           <item row="3" column="1">
-           <widget class="QPushButton" name="DownButton">
+           <widget class="QPushButton" name="downButton">
             <property name="text">
              <string>Down</string>
             </property>
@@ -124,7 +127,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QPushButton" name="UpButton">
+           <widget class="QPushButton" name="upButton">
             <property name="text">
              <string>Up</string>
             </property>
@@ -133,45 +136,30 @@
          </layout>
         </item>
         <item>
-         <widget class="QLabel" name="createConnectState">
-          <property name="font">
-           <font>
-            <pointsize>22</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="rightGrid">
           <item row="2" column="0">
-           <widget class="QPushButton" name="LeftButton">
+           <widget class="QPushButton" name="leftButton">
             <property name="text">
              <string>Left</string>
             </property>
            </widget>
           </item>
           <item row="3" column="1">
-           <widget class="QPushButton" name="BackButton">
+           <widget class="QPushButton" name="backButton">
             <property name="text">
              <string>Backward</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QPushButton" name="ForwardButton">
+           <widget class="QPushButton" name="forwardButton">
             <property name="text">
              <string>Forward</string>
             </property>
            </widget>
           </item>
           <item row="2" column="2">
-           <widget class="QPushButton" name="RightButton">
+           <widget class="QPushButton" name="rightButton">
             <property name="text">
              <string>Right</string>
             </property>
@@ -182,9 +170,9 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="TestProgramHorizontal" stretch="0,0">
+       <layout class="QHBoxLayout" name="takeoffLandHorizontal" stretch="0,0">
         <item>
-         <widget class="QPushButton" name="Create3SensorListButton">
+         <widget class="QPushButton" name="takeoffButton">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -202,7 +190,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="Create3ExampleProgramButton">
+         <widget class="QPushButton" name="landButton">
           <property name="minimumSize">
            <size>
             <width>0</width>