diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui
index f935b6dcb..0f7b8f980 100644
--- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui
+++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui
@@ -17,6 +17,9 @@
    <property name="spacing">
     <number>12</number>
    </property>
+   <property name="margin">
+    <number>12</number>
+   </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
@@ -33,13 +36,7 @@
        <property name="spacing">
         <number>12</number>
        </property>
-       <property name="leftMargin">
-        <number>12</number>
-       </property>
-       <property name="rightMargin">
-        <number>12</number>
-       </property>
-       <property name="bottomMargin">
+       <property name="margin">
         <number>12</number>
        </property>
        <item>
@@ -90,6 +87,9 @@
               <string/>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_2">
+              <property name="margin">
+               <number>12</number>
+              </property>
               <item>
                <widget class="QCheckBox" name="enableCameraStabilization">
                 <property name="focusPolicy">
@@ -131,6 +131,12 @@
               <bool>false</bool>
              </property>
              <layout class="QGridLayout" name="gridLayout_9">
+              <property name="leftMargin">
+               <number>12</number>
+              </property>
+              <property name="rightMargin">
+               <number>12</number>
+              </property>
               <item row="3" column="3">
                <widget class="QSpinBox" name="yawOutputRange">
                 <property name="focusPolicy">
@@ -345,6 +351,12 @@ margin:1px;</string>
               <string>Advanced Settings (Control)</string>
              </property>
              <layout class="QGridLayout" name="gridLayout_8">
+              <property name="leftMargin">
+               <number>12</number>
+              </property>
+              <property name="rightMargin">
+               <number>12</number>
+              </property>
               <item row="1" column="3">
                <widget class="QLabel" name="label_32">
                 <property name="styleSheet">
@@ -756,6 +768,9 @@ value.</string>
       <string>Messages</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="margin">
+       <number>12</number>
+      </property>
       <item>
        <widget class="QLabel" name="message">
         <property name="text">
@@ -772,6 +787,9 @@ value.</string>
       <string/>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
+      <property name="margin">
+       <number>12</number>
+      </property>
       <item>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
diff --git a/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp b/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp
index 813c32a94..0aaa900ab 100644
--- a/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp
+++ b/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp
@@ -35,23 +35,6 @@ OutputChannelForm::OutputChannelForm(const int index, QWidget *parent, const boo
         m_inChannelTest(false)
 {
     ui.setupUi(this);
-//    if(!showLegend)
-//    {
-//        // Remove legend
-//        QGridLayout *grid_layout = dynamic_cast<QGridLayout*>(layout());
-//        Q_ASSERT(grid_layout);
-//        for (int col = 0; col < grid_layout->columnCount(); col++)
-//        { // remove every item in first row
-//            QLayoutItem *item = grid_layout->itemAtPosition(0, col);
-//            if (!item) continue;
-//            // get widget from layout item
-//            QWidget *legend_widget = item->widget();
-//            if (!legend_widget) continue;
-//            // delete widget
-//            grid_layout->removeWidget(legend_widget);
-//            delete legend_widget;
-//        }
-//    }
 
     // The convention for OP is Channel 1 to Channel 10.
     ui.actuatorNumber->setText(QString("%1:").arg(m_index+1));