diff --git a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui
index 39e0c4c5b..5c325be41 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui
+++ b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui
@@ -20,16 +20,7 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
-   <property name="leftMargin">
-    <number>12</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>12</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -48,26 +39,14 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>584</width>
+        <width>608</width>
         <height>483</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="leftMargin">
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="topMargin">
-        <number>12</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_3"/>
-       </item>
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
diff --git a/ground/openpilotgcs/src/plugins/serialconnection/serialpluginoptions.ui b/ground/openpilotgcs/src/plugins/serialconnection/serialpluginoptions.ui
index 912099bac..eb0847ef4 100644
--- a/ground/openpilotgcs/src/plugins/serialconnection/serialpluginoptions.ui
+++ b/ground/openpilotgcs/src/plugins/serialconnection/serialpluginoptions.ui
@@ -14,6 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">