diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui
index 9a1557eef..0ea3f9f39 100644
--- a/ground/openpilotgcs/src/plugins/config/input.ui
+++ b/ground/openpilotgcs/src/plugins/config/input.ui
@@ -116,8 +116,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>774</width>
-            <height>497</height>
+            <width>1228</width>
+            <height>669</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout">
@@ -274,8 +274,7 @@
                   </item>
                  </layout>
                 </widget>
-                <widget class="QWidget" name="wizard">
-                </widget>
+                <widget class="QWidget" name="wizard"/>
                </widget>
               </item>
              </layout>
@@ -491,8 +490,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>730</width>
-            <height>554</height>
+            <width>1228</width>
+            <height>669</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_7" rowstretch="1,0,0,0">
@@ -1962,7 +1961,7 @@ font:bold;</string>
                      <string>objname:StabilizationSettings</string>
                      <string>fieldname:FlightModeAssistMap</string>
                      <string>index:0</string>
-                     <string>haslimits:no</string>
+                     <string>haslimits:yes</string>
                      <string>scale:1</string>
                      <string>buttongroup:16</string>
                     </stringlist>
@@ -1988,7 +1987,7 @@ font:bold;</string>
                      <string>objname:StabilizationSettings</string>
                      <string>fieldname:FlightModeAssistMap</string>
                      <string>index:1</string>
-                     <string>haslimits:no</string>
+                     <string>haslimits:yes</string>
                      <string>scale:1</string>
                      <string>buttongroup:16</string>
                     </stringlist>
@@ -2014,7 +2013,7 @@ font:bold;</string>
                      <string>objname:StabilizationSettings</string>
                      <string>fieldname:FlightModeAssistMap</string>
                      <string>index:2</string>
-                     <string>haslimits:no</string>
+                     <string>haslimits:yes</string>
                      <string>scale:1</string>
                      <string>buttongroup:16</string>
                     </stringlist>
@@ -2043,7 +2042,7 @@ font:bold;</string>
                      <string>objname:StabilizationSettings</string>
                      <string>fieldname:FlightModeAssistMap</string>
                      <string>index:3</string>
-                     <string>haslimits:no</string>
+                     <string>haslimits:yes</string>
                      <string>scale:1</string>
                      <string>buttongroup:16</string>
                     </stringlist>
@@ -2072,7 +2071,7 @@ font:bold;</string>
                      <string>objname:StabilizationSettings</string>
                      <string>fieldname:FlightModeAssistMap</string>
                      <string>index:4</string>
-                     <string>haslimits:no</string>
+                     <string>haslimits:yes</string>
                      <string>scale:1</string>
                      <string>buttongroup:16</string>
                     </stringlist>
@@ -2101,7 +2100,7 @@ font:bold;</string>
                      <string>objname:StabilizationSettings</string>
                      <string>fieldname:FlightModeAssistMap</string>
                      <string>index:5</string>
-                     <string>haslimits:no</string>
+                     <string>haslimits:yes</string>
                      <string>scale:1</string>
                      <string>buttongroup:16</string>
                     </stringlist>
@@ -2214,8 +2213,8 @@ font:bold;</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>544</width>
-            <height>169</height>
+            <width>1228</width>
+            <height>669</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/shared/uavobjectdefinition/stabilizationsettings.xml b/shared/uavobjectdefinition/stabilizationsettings.xml
index f0369782e..9187d13f3 100644
--- a/shared/uavobjectdefinition/stabilizationsettings.xml
+++ b/shared/uavobjectdefinition/stabilizationsettings.xml
@@ -49,7 +49,26 @@
 	<field name="FlightModeAssistMap" units="" type="enum"
 	    options="None,GPSAssist"
 	    elements="6"
-	    defaultvalue="None,None,None,None,None,None"/>
+	    defaultvalue="None,None,None,None,None,None"
+        limits="\
+                %0401NE:GPSAssist,\
+                %0402NE:GPSAssist;\
+                \
+                %0401NE:GPSAssist,\
+                %0402NE:GPSAssist;\
+                \
+                %0401NE:GPSAssist,\
+                %0402NE:GPSAssist;\
+                \
+                %0401NE:GPSAssist,\
+                %0402NE:GPSAssist;\
+                \
+                %0401NE:GPSAssist,\
+                %0402NE:GPSAssist;\
+                \
+                %0401NE:GPSAssist,\
+                %0402NE:GPSAssist;"
+    />
 
 	<access gcs="readwrite" flight="readwrite"/>
 	<telemetrygcs acked="true" updatemode="onchange" period="0"/>