diff --git a/plugins/m2k/ui/channel_settings.ui b/plugins/m2k/ui/channel_settings.ui
index 0eae57245..c643d9c8a 100644
--- a/plugins/m2k/ui/channel_settings.ui
+++ b/plugins/m2k/ui/channel_settings.ui
@@ -18,28 +18,80 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>30</number>
+    <number>0</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>10</number>
    </property>
    <property name="rightMargin">
-    <number>30</number>
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>10</number>
    </property>
    <item>
-    <widget class="QLabel" name="label_channelName">
+    <widget class="QWidget" name="widget" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text">
-      <string>Channel</string>
-     </property>
-     <property name="menu_title_label" stdset="0">
-      <bool>true</bool>
-     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <property name="spacing">
+       <number>15</number>
+      </property>
+      <property name="leftMargin">
+       <number>10</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>10</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label_channelName">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Channel</string>
+        </property>
+        <property name="menu_title_label" stdset="0">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="Line" name="line_channelColor">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>2</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>2</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">border: 2px solid #ff7200;</string>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
@@ -58,28 +110,6 @@
      </property>
     </spacer>
    </item>
-   <item>
-    <widget class="Line" name="line_channelColor">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>2</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>2</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">border: 2px solid #ff7200;</string>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="sizePolicy">
@@ -102,8 +132,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>475</width>
-        <height>919</height>
+        <width>535</width>
+        <height>893</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -117,7 +147,7 @@
         <number>0</number>
        </property>
        <property name="leftMargin">
-        <number>0</number>
+        <number>10</number>
        </property>
        <property name="topMargin">
         <number>0</number>
diff --git a/plugins/m2k/ui/cursors_settings.ui b/plugins/m2k/ui/cursors_settings.ui
index 96e639ad8..bab09a5cd 100644
--- a/plugins/m2k/ui/cursors_settings.ui
+++ b/plugins/m2k/ui/cursors_settings.ui
@@ -21,7 +21,7 @@
     <number>0</number>
    </property>
    <property name="topMargin">
-    <number>5</number>
+    <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
@@ -55,10 +55,22 @@
         <x>0</x>
         <y>0</y>
         <width>314</width>
-        <height>598</height>
+        <height>603</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_7">
+       <property name="leftMargin">
+        <number>10</number>
+       </property>
+       <property name="topMargin">
+        <number>10</number>
+       </property>
+       <property name="rightMargin">
+        <number>10</number>
+       </property>
+       <property name="bottomMargin">
+        <number>10</number>
+       </property>
        <item>
         <widget class="QLabel" name="label">
          <property name="sizePolicy">
@@ -75,6 +87,22 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>9</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="Line" name="line">
          <property name="sizePolicy">
@@ -103,22 +131,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>15</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_5">
          <property name="spacing">
@@ -167,7 +179,7 @@
                <bool>true</bool>
               </property>
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
@@ -178,6 +190,12 @@
                 <height>30</height>
                </size>
               </property>
+              <property name="maximumSize">
+               <size>
+                <width>238</width>
+                <height>30</height>
+               </size>
+              </property>
               <property name="styleSheet">
                <string notr="true">QPushButton {
 min-height: 30px;
@@ -776,7 +794,7 @@ color: rgba(255,255,255,51);
   <customwidget>
    <class>scopy::CustomSwitch</class>
    <extends>QPushButton</extends>
-   <header>customSwitch.h</header>
+   <header>gui/customSwitch.h</header>
   </customwidget>
   <customwidget>
    <class>scopy::SmallOnOffSwitch</class>
diff --git a/plugins/m2k/ui/dmm.ui b/plugins/m2k/ui/dmm.ui
index 875cd0ffe..c767af794 100644
--- a/plugins/m2k/ui/dmm.ui
+++ b/plugins/m2k/ui/dmm.ui
@@ -898,16 +898,16 @@ QLabel{font-size:35pt;}</string>
          <number>0</number>
         </property>
         <property name="leftMargin">
-         <number>25</number>
+         <number>0</number>
         </property>
         <property name="topMargin">
-         <number>20</number>
+         <number>10</number>
         </property>
         <property name="rightMargin">
-         <number>5</number>
+         <number>0</number>
         </property>
         <property name="bottomMargin">
-         <number>0</number>
+         <number>10</number>
         </property>
         <item>
          <widget class="QScrollArea" name="scrollArea">
@@ -932,6 +932,9 @@ QLabel{font-size:35pt;}</string>
           <property name="horizontalScrollBarPolicy">
            <enum>Qt::ScrollBarAlwaysOff</enum>
           </property>
+          <property name="sizeAdjustPolicy">
+           <enum>QAbstractScrollArea::AdjustToContents</enum>
+          </property>
           <property name="widgetResizable">
            <bool>true</bool>
           </property>
@@ -955,7 +958,7 @@ QLabel{font-size:35pt;}</string>
              <number>15</number>
             </property>
             <property name="leftMargin">
-             <number>0</number>
+             <number>10</number>
             </property>
             <property name="topMargin">
              <number>0</number>
@@ -2032,7 +2035,6 @@ line-height: 14px;
  </customwidgets>
  <resources>
   <include location="../../../gui/res/resources.qrc"/>
-  <include location="../../../gui/res/resources.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -2069,7 +2071,7 @@ line-height: 14px;
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="buttonGroup_2"/>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="buttonGroup_2"/>
  </buttongroups>
 </ui>
diff --git a/plugins/m2k/ui/logic_analyzer.ui b/plugins/m2k/ui/logic_analyzer.ui
index 30f168c2c..c19d931e5 100644
--- a/plugins/m2k/ui/logic_analyzer.ui
+++ b/plugins/m2k/ui/logic_analyzer.ui
@@ -476,7 +476,7 @@
                 <string notr="true"/>
                </property>
                <property name="currentIndex">
-                <number>1</number>
+                <number>0</number>
                </property>
                <widget class="QWidget" name="channelSettings">
                 <property name="minimumSize">
@@ -490,16 +490,16 @@
                   <number>15</number>
                  </property>
                  <property name="leftMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <property name="topMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <property name="rightMargin">
-                  <number>10</number>
+                  <number>0</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <item>
                   <widget class="QScrollArea" name="scrollArea">
@@ -526,8 +526,8 @@
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>200</width>
-                      <height>360</height>
+                      <width>400</width>
+                      <height>604</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -553,16 +553,16 @@
                       <number>15</number>
                      </property>
                      <property name="leftMargin">
-                      <number>0</number>
+                      <number>10</number>
                      </property>
                      <property name="topMargin">
-                      <number>0</number>
+                      <number>10</number>
                      </property>
                      <property name="rightMargin">
                       <number>10</number>
                      </property>
                      <property name="bottomMargin">
-                      <number>0</number>
+                      <number>10</number>
                      </property>
                      <item>
                       <widget class="QLabel" name="label_5">
@@ -930,16 +930,16 @@ border-color: grey;
                   <number>15</number>
                  </property>
                  <property name="leftMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="topMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="rightMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <item>
                   <widget class="QLabel" name="label_9">
@@ -1382,16 +1382,16 @@ color: rgba(255,255,255,51);
                   <number>15</number>
                  </property>
                  <property name="leftMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <property name="topMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <property name="rightMargin">
                   <number>0</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <item>
                   <widget class="QScrollArea" name="generalSettingsScrollArea">
@@ -1415,8 +1415,8 @@ color: rgba(255,255,255,51);
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>320</width>
-                      <height>304</height>
+                      <width>522</width>
+                      <height>604</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -1430,16 +1430,16 @@ color: rgba(255,255,255,51);
                       <number>15</number>
                      </property>
                      <property name="leftMargin">
-                      <number>0</number>
+                      <number>10</number>
                      </property>
                      <property name="topMargin">
-                      <number>0</number>
+                      <number>10</number>
                      </property>
                      <property name="rightMargin">
-                      <number>20</number>
+                      <number>10</number>
                      </property>
                      <property name="bottomMargin">
-                      <number>0</number>
+                      <number>10</number>
                      </property>
                      <item>
                       <widget class="QLabel" name="label_3">
@@ -1802,16 +1802,16 @@ color: rgba(255,255,255,51);
                   <number>0</number>
                  </property>
                  <property name="leftMargin">
-                  <number>0</number>
+                  <number>10</number>
                  </property>
                  <property name="topMargin">
                   <number>10</number>
                  </property>
                  <property name="rightMargin">
-                  <number>0</number>
+                  <number>10</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>0</number>
+                  <number>10</number>
                  </property>
                  <item>
                   <layout class="QVBoxLayout" name="wDecoderSettingsContainer">
@@ -1833,10 +1833,10 @@ color: rgba(255,255,255,51);
                       <number>6</number>
                      </property>
                      <property name="leftMargin">
-                      <number>10</number>
+                      <number>0</number>
                      </property>
                      <property name="rightMargin">
-                      <number>10</number>
+                      <number>0</number>
                      </property>
                      <item>
                       <widget class="QPushButton" name="btnCollapseSettings">
@@ -1912,6 +1912,12 @@ color: rgba(255,255,255,51);
                       <property name="sizeConstraint">
                        <enum>QLayout::SetMinimumSize</enum>
                       </property>
+                      <property name="leftMargin">
+                       <number>0</number>
+                      </property>
+                      <property name="rightMargin">
+                       <number>0</number>
+                      </property>
                       <property name="bottomMargin">
                        <number>2</number>
                       </property>
@@ -2123,13 +2129,13 @@ color: rgba(255,255,255,51);
                     <number>2</number>
                    </property>
                    <property name="leftMargin">
-                    <number>10</number>
+                    <number>0</number>
                    </property>
                    <property name="topMargin">
                     <number>0</number>
                    </property>
                    <property name="rightMargin">
-                    <number>10</number>
+                    <number>0</number>
                    </property>
                    <property name="bottomMargin">
                     <number>0</number>
@@ -2171,10 +2177,10 @@ color: rgba(255,255,255,51);
                     <number>0</number>
                    </property>
                    <property name="leftMargin">
-                    <number>6</number>
+                    <number>0</number>
                    </property>
                    <property name="rightMargin">
-                    <number>6</number>
+                    <number>0</number>
                    </property>
                    <item>
                     <widget class="scopy::m2k::logic::DecoderTable" name="decoderTableView">
diff --git a/plugins/m2k/ui/measure_settings.ui b/plugins/m2k/ui/measure_settings.ui
index 660bb76fe..3849ccfea 100644
--- a/plugins/m2k/ui/measure_settings.ui
+++ b/plugins/m2k/ui/measure_settings.ui
@@ -24,16 +24,16 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>18</number>
+    <number>10</number>
    </property>
    <property name="topMargin">
     <number>10</number>
    </property>
    <property name="rightMargin">
-    <number>8</number>
+    <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>10</number>
    </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
@@ -47,93 +47,99 @@
       <number>0</number>
      </property>
      <item>
-      <layout class="QHBoxLayout" name="hLayout_titleBar">
+      <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="spacing">
+        <number>15</number>
+       </property>
+       <property name="leftMargin">
         <number>0</number>
        </property>
+       <property name="rightMargin">
+        <number>10</number>
+       </property>
        <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Measure</string>
+        <layout class="QHBoxLayout" name="hLayout_titleBar">
+         <property name="spacing">
+          <number>0</number>
          </property>
-         <property name="general_settings_label" stdset="0">
-          <bool>true</bool>
+         <property name="leftMargin">
+          <number>0</number>
          </property>
-        </widget>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Measure</string>
+           </property>
+           <property name="general_settings_label" stdset="0">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="lblChanName">
+           <property name="text">
+            <string>Channel</string>
+           </property>
+           <property name="general_settings_label" stdset="0">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+        <widget class="Line" name="line">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="sizeHint" stdset="0">
+         <property name="minimumSize">
           <size>
-           <width>40</width>
-           <height>0</height>
+           <width>0</width>
+           <height>2</height>
           </size>
          </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="lblChanName">
-         <property name="text">
-          <string>Channel</string>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>2</height>
+          </size>
          </property>
-         <property name="general_settings_label" stdset="0">
-          <bool>true</bool>
+         <property name="styleSheet">
+          <string notr="true">border: 2px solid rgb(255, 114, 0);</string>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item>
-      <spacer name="verticalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="Line" name="line">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>2</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>2</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">border: 2px solid rgb(255, 114, 0);</string>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QScrollArea" name="scrollArea">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -153,7 +159,7 @@
           <x>0</x>
           <y>0</y>
           <width>311</width>
-          <height>674</height>
+          <height>667</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -189,21 +195,21 @@
            <property name="horizontalSpacing">
             <number>0</number>
            </property>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_6">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
+           <item row="0" column="0" colspan="2">
+            <spacer name="verticalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
              </property>
-             <property name="text">
-              <string>MEASUREMENTS </string>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
              </property>
-             <property name="subsection_label" stdset="0">
-              <bool>true</bool>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>25</height>
+              </size>
              </property>
-            </widget>
+            </spacer>
            </item>
            <item row="1" column="1">
             <widget class="Line" name="line_2">
@@ -237,21 +243,21 @@
              </property>
             </spacer>
            </item>
-           <item row="0" column="0" colspan="2">
-            <spacer name="verticalSpacer_3">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_6">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
              </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
+             <property name="text">
+              <string>MEASUREMENTS </string>
              </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>0</width>
-               <height>25</height>
-              </size>
+             <property name="subsection_label" stdset="0">
+              <bool>true</bool>
              </property>
-            </spacer>
+            </widget>
            </item>
           </layout>
          </item>
diff --git a/plugins/m2k/ui/network_analyzer.ui b/plugins/m2k/ui/network_analyzer.ui
index b1eac2bba..7ebb5311a 100644
--- a/plugins/m2k/ui/network_analyzer.ui
+++ b/plugins/m2k/ui/network_analyzer.ui
@@ -747,7 +747,7 @@ border: 5px solid gray;
           <item>
            <widget class="scopy::MenuHAnim" name="rightMenu" native="true">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -789,7 +789,7 @@ border: 5px solid gray;
                 </size>
                </property>
                <property name="currentIndex">
-                <number>0</number>
+                <number>2</number>
                </property>
                <widget class="QWidget" name="page_3">
                 <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -833,8 +833,8 @@ border: 5px solid gray;
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>340</width>
-                      <height>1036</height>
+                      <width>577</width>
+                      <height>1016</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -851,16 +851,16 @@ border: 5px solid gray;
                     </property>
                     <layout class="QVBoxLayout" name="verticalLayout_11">
                      <property name="leftMargin">
-                      <number>20</number>
+                      <number>10</number>
                      </property>
                      <property name="topMargin">
-                      <number>20</number>
+                      <number>10</number>
                      </property>
                      <property name="rightMargin">
-                      <number>20</number>
+                      <number>10</number>
                      </property>
                      <property name="bottomMargin">
-                      <number>20</number>
+                      <number>10</number>
                      </property>
                      <item>
                       <widget class="QLabel" name="label_5">
@@ -2015,16 +2015,16 @@ padding-left: 20px;
                   <number>0</number>
                  </property>
                  <property name="leftMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <property name="topMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <property name="rightMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>20</number>
+                  <number>0</number>
                  </property>
                  <item>
                   <widget class="QScrollArea" name="scrollArea_2">
@@ -2042,11 +2042,23 @@ padding-left: 20px;
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>261</width>
-                      <height>529</height>
+                      <width>591</width>
+                      <height>599</height>
                      </rect>
                     </property>
                     <layout class="QVBoxLayout" name="verticalLayout_23">
+                     <property name="leftMargin">
+                      <number>10</number>
+                     </property>
+                     <property name="topMargin">
+                      <number>10</number>
+                     </property>
+                     <property name="rightMargin">
+                      <number>10</number>
+                     </property>
+                     <property name="bottomMargin">
+                      <number>10</number>
+                     </property>
                      <item>
                       <widget class="QLabel" name="label_7">
                        <property name="text">
@@ -2651,10 +2663,16 @@ padding-left: 20px;
                <widget class="QWidget" name="page_5">
                 <layout class="QVBoxLayout" name="verticalLayout_12">
                  <property name="leftMargin">
-                  <number>18</number>
+                  <number>10</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>10</number>
                  </property>
                  <property name="rightMargin">
-                  <number>18</number>
+                  <number>10</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>10</number>
                  </property>
                  <item>
                   <widget class="QLabel" name="label_8">
@@ -3149,6 +3167,11 @@ QLabel {
    <header>m2k-gui/runsinglewidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>scopy::SmallOnOffSwitch</class>
+   <extends>QPushButton</extends>
+   <header>gui/smallOnOffSwitch.h</header>
+  </customwidget>
   <customwidget>
    <class>scopy::dBgraph</class>
    <extends>QFrame</extends>
@@ -3167,15 +3190,9 @@ QLabel {
    <header>m2k-gui/customplotpositionbutton.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>scopy::SmallOnOffSwitch</class>
-   <extends>QPushButton</extends>
-   <header>gui/smallOnOffSwitch.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../gui/res/resources.qrc"/>
-  <include location="../../../gui/res/resources.qrc"/>
  </resources>
  <connections/>
  <buttongroups>
diff --git a/plugins/m2k/ui/osc_general_settings.ui b/plugins/m2k/ui/osc_general_settings.ui
index 3a930295b..28bb139e8 100644
--- a/plugins/m2k/ui/osc_general_settings.ui
+++ b/plugins/m2k/ui/osc_general_settings.ui
@@ -27,16 +27,16 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>18</number>
+    <number>10</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>10</number>
    </property>
    <property name="rightMargin">
-    <number>18</number>
+    <number>10</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>10</number>
    </property>
    <item>
     <widget class="QScrollArea" name="scrollArea">
@@ -66,8 +66,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>267</width>
-        <height>475</height>
+        <width>283</width>
+        <height>455</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -77,6 +77,18 @@
        </sizepolicy>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_5">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <property name="spacing">
diff --git a/plugins/m2k/ui/oscilloscope.ui b/plugins/m2k/ui/oscilloscope.ui
index 0c786cdc7..b471ee639 100644
--- a/plugins/m2k/ui/oscilloscope.ui
+++ b/plugins/m2k/ui/oscilloscope.ui
@@ -798,7 +798,7 @@ Signal View</string>
               <number>0</number>
              </property>
              <property name="topMargin">
-              <number>20</number>
+              <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
@@ -833,13 +833,13 @@ Signal View</string>
                   <number>0</number>
                  </property>
                  <property name="leftMargin">
-                  <number>15</number>
+                  <number>10</number>
                  </property>
                  <property name="topMargin">
                   <number>0</number>
                  </property>
                  <property name="rightMargin">
-                  <number>15</number>
+                  <number>10</number>
                  </property>
                  <property name="bottomMargin">
                   <number>0</number>
@@ -1089,7 +1089,6 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); }</s
  </customwidgets>
  <resources>
   <include location="../../../gui/res/resources.qrc"/>
-  <include location="../../../gui/res/resources.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/plugins/m2k/ui/pattern_generator.ui b/plugins/m2k/ui/pattern_generator.ui
index a0bc68436..cefa52fc3 100644
--- a/plugins/m2k/ui/pattern_generator.ui
+++ b/plugins/m2k/ui/pattern_generator.ui
@@ -446,7 +446,7 @@
               <number>0</number>
              </property>
              <property name="topMargin">
-              <number>20</number>
+              <number>0</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
@@ -480,16 +480,16 @@
                   <number>15</number>
                  </property>
                  <property name="leftMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="topMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="rightMargin">
-                  <number>0</number>
+                  <number>10</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <item>
                   <widget class="QScrollArea" name="scrollArea">
@@ -516,8 +516,8 @@
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>300</width>
-                      <height>474</height>
+                      <width>280</width>
+                      <height>536</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -549,7 +549,7 @@
                       <number>0</number>
                      </property>
                      <property name="rightMargin">
-                      <number>10</number>
+                      <number>0</number>
                      </property>
                      <property name="bottomMargin">
                       <number>0</number>
@@ -943,16 +943,16 @@ color: rgba(255,255,255,51);
                   <number>15</number>
                  </property>
                  <property name="leftMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="topMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="rightMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <item>
                   <widget class="QLabel" name="label_9">
@@ -1342,16 +1342,16 @@ color: rgba(255,255,255,51);
                   <number>15</number>
                  </property>
                  <property name="leftMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="topMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="rightMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>20</number>
+                  <number>10</number>
                  </property>
                  <item>
                   <widget class="QScrollArea" name="generalSettingsScrollArea">
@@ -1372,7 +1372,7 @@ color: rgba(255,255,255,51);
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>220</width>
+                      <width>200</width>
                       <height>134</height>
                      </rect>
                     </property>
@@ -1393,7 +1393,7 @@ color: rgba(255,255,255,51);
                       <number>0</number>
                      </property>
                      <property name="rightMargin">
-                      <number>20</number>
+                      <number>0</number>
                      </property>
                      <property name="bottomMargin">
                       <number>0</number>
@@ -1815,7 +1815,6 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); }</s
  </customwidgets>
  <resources>
   <include location="../../../gui/res/resources.qrc"/>
-  <include location="../../../gui/res/resources.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/plugins/m2k/ui/powercontrol.ui b/plugins/m2k/ui/powercontrol.ui
index 93fdca1bd..3f79a315f 100644
--- a/plugins/m2k/ui/powercontrol.ui
+++ b/plugins/m2k/ui/powercontrol.ui
@@ -567,16 +567,16 @@ color: #9013fe;
          <number>10</number>
         </property>
         <property name="leftMargin">
-         <number>26</number>
+         <number>10</number>
         </property>
         <property name="topMargin">
-         <number>26</number>
+         <number>10</number>
         </property>
         <property name="rightMargin">
-         <number>26</number>
+         <number>10</number>
         </property>
         <property name="bottomMargin">
-         <number>26</number>
+         <number>10</number>
         </property>
         <item>
          <widget class="QScrollArea" name="scrollArea">
@@ -592,6 +592,9 @@ color: #9013fe;
           <property name="horizontalScrollBarPolicy">
            <enum>Qt::ScrollBarAlwaysOff</enum>
           </property>
+          <property name="sizeAdjustPolicy">
+           <enum>QAbstractScrollArea::AdjustToContents</enum>
+          </property>
           <property name="widgetResizable">
            <bool>true</bool>
           </property>
@@ -600,11 +603,23 @@ color: #9013fe;
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>218</width>
-             <height>473</height>
+             <width>200</width>
+             <height>535</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_2">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
             <item>
              <widget class="QLabel" name="label_12">
               <property name="text">
@@ -1117,7 +1132,6 @@ QPushButton:disabled {
  </customwidgets>
  <resources>
   <include location="../../../gui/res/resources.qrc"/>
-  <include location="../../../gui/res/resources.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/plugins/m2k/ui/signal_generator.ui b/plugins/m2k/ui/signal_generator.ui
index f2521c980..0b46c0dd5 100644
--- a/plugins/m2k/ui/signal_generator.ui
+++ b/plugins/m2k/ui/signal_generator.ui
@@ -172,21 +172,21 @@
             <number>0</number>
            </property>
            <property name="leftMargin">
-            <number>20</number>
+            <number>0</number>
            </property>
            <property name="topMargin">
-            <number>25</number>
+            <number>10</number>
            </property>
            <property name="rightMargin">
-            <number>10</number>
+            <number>0</number>
            </property>
            <property name="bottomMargin">
-            <number>20</number>
+            <number>10</number>
            </property>
            <item>
             <widget class="QScrollArea" name="scrollArea">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -209,54 +209,48 @@
              <property name="horizontalScrollBarPolicy">
               <enum>Qt::ScrollBarAlwaysOff</enum>
              </property>
+             <property name="sizeAdjustPolicy">
+              <enum>QAbstractScrollArea::AdjustToContents</enum>
+             </property>
              <property name="widgetResizable">
               <bool>true</bool>
              </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+             </property>
              <widget class="QWidget" name="scrollAreaWidgetContents">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>314</width>
-                <height>594</height>
+                <width>400</width>
+                <height>646</height>
                </rect>
               </property>
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
-              <property name="maximumSize">
-               <size>
-                <width>380</width>
-                <height>16777215</height>
-               </size>
-              </property>
               <layout class="QVBoxLayout" name="verticalLayout_10">
                <property name="spacing">
                 <number>0</number>
                </property>
                <property name="leftMargin">
-                <number>0</number>
+                <number>10</number>
                </property>
                <property name="topMargin">
                 <number>0</number>
                </property>
                <property name="rightMargin">
-                <number>0</number>
+                <number>10</number>
                </property>
                <property name="bottomMargin">
                 <number>0</number>
                </property>
                <item>
                 <widget class="QTabWidget" name="tabWidget">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
                  <property name="styleSheet">
                   <string notr="true"/>
                  </property>
@@ -267,12 +261,6 @@
                   <bool>false</bool>
                  </property>
                  <widget class="QWidget" name="tabConstant">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <attribute name="title">
                    <string>Constant</string>
                   </attribute>
@@ -334,12 +322,6 @@
                   </layout>
                  </widget>
                  <widget class="QWidget" name="tabWaveform">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <attribute name="title">
                    <string>Waveform</string>
                   </attribute>
@@ -531,12 +513,6 @@
                   </layout>
                  </widget>
                  <widget class="QWidget" name="tabBuffer">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <attribute name="title">
                    <string>Buffer</string>
                   </attribute>
@@ -936,12 +912,6 @@ background-repeat: no-repeat;
                   </layout>
                  </widget>
                  <widget class="QWidget" name="tabMath">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <attribute name="title">
                    <string>Math</string>
                   </attribute>
diff --git a/plugins/m2k/ui/spectrum_analyzer.ui b/plugins/m2k/ui/spectrum_analyzer.ui
index 11e92e228..8528fac27 100644
--- a/plugins/m2k/ui/spectrum_analyzer.ui
+++ b/plugins/m2k/ui/spectrum_analyzer.ui
@@ -490,7 +490,7 @@ min-width: 6em;
            <item>
             <widget class="QStackedWidget" name="stackedWidget">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -504,16 +504,16 @@ min-width: 6em;
                 <number>15</number>
                </property>
                <property name="leftMargin">
-                <number>20</number>
+                <number>10</number>
                </property>
                <property name="topMargin">
-                <number>25</number>
+                <number>10</number>
                </property>
                <property name="rightMargin">
-                <number>20</number>
+                <number>10</number>
                </property>
                <property name="bottomMargin">
-                <number>0</number>
+                <number>10</number>
                </property>
                <item>
                 <widget class="QLabel" name="channelSettingsTitle">
@@ -888,16 +888,16 @@ min-width: 64px;
                 <number>0</number>
                </property>
                <property name="leftMargin">
-                <number>18</number>
+                <number>10</number>
                </property>
                <property name="topMargin">
-                <number>20</number>
+                <number>10</number>
                </property>
                <property name="rightMargin">
-                <number>18</number>
+                <number>10</number>
                </property>
                <property name="bottomMargin">
-                <number>0</number>
+                <number>10</number>
                </property>
                <item>
                 <widget class="QLabel" name="labelGeneralSettingsTitle">
@@ -1014,16 +1014,16 @@ min-width: 64px;
                 <number>0</number>
                </property>
                <property name="leftMargin">
-                <number>18</number>
+                <number>0</number>
                </property>
                <property name="topMargin">
-                <number>20</number>
+                <number>10</number>
                </property>
                <property name="rightMargin">
-                <number>18</number>
+                <number>0</number>
                </property>
                <property name="bottomMargin">
-                <number>0</number>
+                <number>10</number>
                </property>
                <item>
                 <widget class="QScrollArea" name="scrollArea">
@@ -1033,6 +1033,9 @@ min-width: 64px;
                  <property name="horizontalScrollBarPolicy">
                   <enum>Qt::ScrollBarAlwaysOff</enum>
                  </property>
+                 <property name="sizeAdjustPolicy">
+                  <enum>QAbstractScrollArea::AdjustToContents</enum>
+                 </property>
                  <property name="widgetResizable">
                   <bool>true</bool>
                  </property>
@@ -1041,8 +1044,8 @@ min-width: 64px;
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                    <width>298</width>
-                    <height>523</height>
+                    <width>336</width>
+                    <height>545</height>
                    </rect>
                   </property>
                   <property name="sizePolicy">
@@ -1052,10 +1055,22 @@ min-width: 64px;
                    </sizepolicy>
                   </property>
                   <layout class="QVBoxLayout" name="verticalLayout_16">
+                   <property name="leftMargin">
+                    <number>10</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>0</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>10</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>0</number>
+                   </property>
                    <item>
                     <layout class="QHBoxLayout" name="hLayout_title">
                      <property name="bottomMargin">
-                      <number>14</number>
+                      <number>9</number>
                      </property>
                      <item>
                       <widget class="QLabel" name="labelSettingsTitle">
@@ -1112,6 +1127,12 @@ min-width: 64px;
                    </item>
                    <item>
                     <widget class="scopy::CustomSwitch" name="logBtn">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
                      <property name="styleSheet">
                       <string notr="true">QPushButton {
 min-width: 280px;
@@ -1567,16 +1588,16 @@ color: rgba(255,255,255,51);
                 <number>0</number>
                </property>
                <property name="leftMargin">
-                <number>18</number>
+                <number>0</number>
                </property>
                <property name="topMargin">
-                <number>20</number>
+                <number>10</number>
                </property>
                <property name="rightMargin">
-                <number>18</number>
+                <number>0</number>
                </property>
                <property name="bottomMargin">
-                <number>0</number>
+                <number>10</number>
                </property>
                <item>
                 <widget class="QScrollArea" name="scrollArea_2">
@@ -1594,11 +1615,23 @@ color: rgba(255,255,255,51);
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                    <width>268</width>
-                    <height>547</height>
+                    <width>336</width>
+                    <height>545</height>
                    </rect>
                   </property>
                   <layout class="QVBoxLayout" name="verticalLayout_17">
+                   <property name="leftMargin">
+                    <number>10</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>0</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>10</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>0</number>
+                   </property>
                    <item>
                     <layout class="QHBoxLayout" name="hLayout_markers_title">
                      <property name="bottomMargin">
@@ -2113,16 +2146,16 @@ border-width: 0px;
              <widget class="QWidget" name="addReference">
               <layout class="QVBoxLayout" name="verticalLayout_13">
                <property name="leftMargin">
-                <number>18</number>
+                <number>10</number>
                </property>
                <property name="topMargin">
-                <number>20</number>
+                <number>10</number>
                </property>
                <property name="rightMargin">
-                <number>18</number>
+                <number>10</number>
                </property>
                <property name="bottomMargin">
-                <number>0</number>
+                <number>10</number>
                </property>
                <item>
                 <layout class="QVBoxLayout" name="verticalLayout_14">
diff --git a/plugins/m2k/ui/trigger_settings.ui b/plugins/m2k/ui/trigger_settings.ui
index b556453a3..8573b184e 100644
--- a/plugins/m2k/ui/trigger_settings.ui
+++ b/plugins/m2k/ui/trigger_settings.ui
@@ -36,26 +36,58 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>18</number>
+    <number>0</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>10</number>
    </property>
    <property name="rightMargin">
-    <number>8</number>
+    <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>10</number>
    </property>
    <item>
-    <widget class="QLabel" name="label_title">
-     <property name="text">
-      <string>Trigger Settings</string>
+    <layout class="QVBoxLayout" name="verticalLayout_13">
+     <property name="spacing">
+      <number>15</number>
      </property>
-     <property name="general_settings_label" stdset="0">
-      <bool>true</bool>
+     <property name="leftMargin">
+      <number>10</number>
      </property>
-    </widget>
+     <item>
+      <widget class="QLabel" name="label_title">
+       <property name="text">
+        <string>Trigger Settings</string>
+       </property>
+       <property name="general_settings_label" stdset="0">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="Line" name="line_under_title">
+       <property name="minimumSize">
+        <size>
+         <width>240</width>
+         <height>2</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>240</width>
+         <height>2</height>
+        </size>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="blue_line" stdset="0">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <spacer name="verticalSpacer_2">
@@ -73,28 +105,6 @@
      </property>
     </spacer>
    </item>
-   <item>
-    <widget class="Line" name="line_under_title">
-     <property name="minimumSize">
-      <size>
-       <width>240</width>
-       <height>2</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>240</width>
-       <height>2</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="blue_line" stdset="0">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="frameShape">
@@ -111,8 +121,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>266</width>
-        <height>959</height>
+        <width>292</width>
+        <height>958</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -120,13 +130,13 @@
         <number>20</number>
        </property>
        <property name="leftMargin">
-        <number>0</number>
+        <number>10</number>
        </property>
        <property name="topMargin">
         <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>10</number>
        </property>
        <property name="bottomMargin">
         <number>0</number>