diff --git a/ui/OtherNetworkWidget.ui.autosave b/ui/OtherNetworkWidget.ui.autosave
deleted file mode 100644
index 6c563aaa..00000000
--- a/ui/OtherNetworkWidget.ui.autosave
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OtherNetworkWidget</class>
- <widget class="QWidget" name="OtherNetworkWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>480</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Other Network</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>6</number>
-   </property>
-   <property name="topMargin">
-    <number>6</number>
-   </property>
-   <property name="rightMargin">
-    <number>6</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="font">
-        <font>
-         <pointsize>33</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Network Name:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="LineEdit" name="ssid">
-       <property name="font">
-        <font>
-         <pointsize>33</pointsize>
-        </font>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="font">
-        <font>
-         <pointsize>33</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Security:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="security">
-       <property name="font">
-        <font>
-         <pointsize>33</pointsize>
-        </font>
-       </property>
-       <item>
-        <property name="text">
-         <string>None</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>WPA</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>WEP</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Dynamic WEP</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="font">
-        <font>
-         <pointsize>33</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Password:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="LineEdit" name="password">
-       <property name="font">
-        <font>
-         <pointsize>33</pointsize>
-        </font>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="1,0">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Preferred</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="join">
-       <property name="minimumSize">
-        <size>
-         <width>200</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>120</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>33</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Join</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../rc/icons.qrc">
-         <normaloff>:/icons/fontawesome/solid/icons/fontawesome/solid/wifi.svg</normaloff>:/icons/fontawesome/solid/icons/fontawesome/solid/wifi.svg</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>30</width>
-         <height>30</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>LineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>LineEdit.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../rc/icons.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/ui/TelloWidget.ui b/ui/TelloWidget.ui
index b874f88d..f4a569ed 100644
--- a/ui/TelloWidget.ui
+++ b/ui/TelloWidget.ui
@@ -75,7 +75,11 @@
        <item>
         <widget class="QPushButton" name="TelloDisconnect">
          <property name="enabled">
+<<<<<<< HEAD
           <bool>false</bool>
+=======
+          <bool>true</bool>
+>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -135,9 +139,12 @@
        </item>
        <item>
         <widget class="QPushButton" name="landButton">
+<<<<<<< HEAD
          <property name="enabled">
           <bool>false</bool>
          </property>
+=======
+>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -252,6 +259,7 @@
          </property>
         </widget>
        </item>
+<<<<<<< HEAD
        <item row="3" column="2" alignment="Qt::AlignRight|Qt::AlignBottom">
         <widget class="QPushButton" name="videoButton">
          <property name="minimumSize">
@@ -265,6 +273,8 @@
          </property>
         </widget>
        </item>
+=======
+>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
       </layout>
      </item>
      <item>
@@ -290,6 +300,7 @@
          </property>
         </widget>
        </item>
+<<<<<<< HEAD
        <item row="0" column="1">
         <widget class="QPushButton" name="pushButton">
          <property name="minimumSize">
@@ -308,6 +319,8 @@
          </property>
         </widget>
        </item>
+=======
+>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
        <item row="1" column="0">
         <widget class="QPushButton" name="leftButton">
          <property name="minimumSize">
@@ -326,6 +339,27 @@
          </property>
         </widget>
        </item>
+<<<<<<< HEAD
+=======
+       <item row="0" column="1">
+        <widget class="QPushButton" name="pushButton">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>18</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Forward</string>
+         </property>
+        </widget>
+       </item>
+>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
        <item row="2" column="1">
         <widget class="QPushButton" name="backButton">
          <property name="minimumSize">
@@ -344,6 +378,7 @@
          </property>
         </widget>
        </item>
+<<<<<<< HEAD
        <item row="2" column="0" alignment="Qt::AlignLeft|Qt::AlignBottom">
         <widget class="QPushButton" name="telemetryButton">
          <property name="minimumSize">
@@ -357,11 +392,14 @@
          </property>
         </widget>
        </item>
+=======
+>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
       </layout>
      </item>
     </layout>
    </item>
    <item>
+<<<<<<< HEAD
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <layout class="QHBoxLayout" name="telloBatteryHorizontal">
@@ -419,6 +457,43 @@
         </widget>
        </item>
       </layout>
+=======
+    <layout class="QHBoxLayout" name="telloBatteryHorizontal">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="telloBatteryPercentLabel">
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>35</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Battery %: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="telloBatteryLabel">
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>35</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
      </item>
     </layout>
    </item>