diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade
index 82dc707..96a313f 100644
--- a/ubl-settings-bootloader.glade
+++ b/ubl-settings-bootloader.glade
@@ -442,12 +442,19 @@
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>
             <property name="can-focus">True</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-bottom">5</property>
             <property name="hscrollbar-policy">never</property>
             <property name="shadow-type">in</property>
             <child>
               <object class="GtkViewport">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-top">5</property>
+                <property name="margin-bottom">5</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
@@ -462,12 +469,6 @@
                           <object class="GtkFrame">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
-                            <property name="margin-right">5</property>
-                            <property name="margin-start">5</property>
-                            <property name="margin-end">5</property>
-                            <property name="margin-top">5</property>
-                            <property name="margin-bottom">5</property>
                             <property name="label-xalign">0.019999999552965164</property>
                             <property name="shadow-type">in</property>
                             <child>
@@ -496,9 +497,10 @@
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">True</property>
                                                 <property name="receives-default">False</property>
-                                                <property name="margin-left">3</property>
-                                                <property name="margin-right">5</property>
                                                 <property name="draw-indicator">True</property>
+                                                <style>
+                                                  <class name="thin"/>
+                                                </style>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -546,8 +548,6 @@
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
                                                 <property name="halign">start</property>
-                                                <property name="margin-left">5</property>
-                                                <property name="margin-right">4</property>
                                                 <property name="label" translatable="yes">Default load</property>
                                                 <property name="ellipsize">start</property>
                                                 <property name="xalign">0</property>
@@ -562,8 +562,6 @@
                                               <object class="GtkEntry" id="entrListOS">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">True</property>
-                                                <property name="margin-left">5</property>
-                                                <property name="margin-right">5</property>
                                                 <property name="margin-top">5</property>
                                                 <property name="margin-bottom">5</property>
                                               </object>
@@ -605,17 +603,12 @@
                                           <object class="GtkBox">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
+                                            <property name="spacing">5</property>
                                             <child>
                                               <object class="GtkLabel" id="lblDownloadMode">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
                                                 <property name="halign">start</property>
-                                                <property name="margin-left">5</property>
-                                                <property name="margin-right">5</property>
-                                                <property name="margin-start">5</property>
-                                                <property name="margin-end">5</property>
-                                                <property name="margin-top">5</property>
-                                                <property name="margin-bottom">5</property>
                                                 <property name="label" translatable="yes">Load screen display mode:</property>
                                                 <property name="ellipsize">start</property>
                                                 <property name="xalign">0</property>
@@ -630,9 +623,6 @@
                                               <object class="GtkComboBoxText" id="cmbDownloadMode">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
-                                                <property name="margin-left">5</property>
-                                                <property name="margin-right">10</property>
-                                                <property name="margin-start">5</property>
                                                 <property name="margin-top">5</property>
                                                 <property name="margin-bottom">5</property>
                                               </object>
@@ -653,22 +643,22 @@
                                           <object class="GtkFrame">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="margin-left">5</property>
-                                            <property name="margin-right">10</property>
                                             <property name="label-xalign">0.019999999552965164</property>
                                             <property name="shadow-type">in</property>
                                             <child>
-                                              <object class="GtkBox">
+                                              <object class="GtkAlignment">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
-                                                <property name="margin-start">5</property>
-                                                <property name="margin-end">5</property>
-                                                <property name="margin-bottom">5</property>
-                                                <property name="spacing">5</property>
                                                 <child>
-                                                  <object class="GtkAlignment">
+                                                  <object class="GtkBox">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">False</property>
+                                                    <property name="margin-left">5</property>
+                                                    <property name="margin-right">5</property>
+                                                    <property name="margin-start">5</property>
+                                                    <property name="margin-end">5</property>
+                                                    <property name="margin-bottom">5</property>
+                                                    <property name="spacing">5</property>
                                                     <child>
                                                       <object class="GtkBox">
                                                         <property name="visible">True</property>
@@ -702,92 +692,92 @@
                                                           </packing>
                                                         </child>
                                                       </object>
+                                                      <packing>
+                                                        <property name="expand">True</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
                                                     </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkBox">
-                                                    <property name="visible">True</property>
-                                                    <property name="can-focus">False</property>
-                                                    <property name="orientation">vertical</property>
-                                                    <property name="spacing">5</property>
                                                     <child>
-                                                      <object class="GtkButton" id="btnAddUser">
+                                                      <object class="GtkBox">
                                                         <property name="visible">True</property>
-                                                        <property name="can-focus">True</property>
-                                                        <property name="receives-default">True</property>
+                                                        <property name="can-focus">False</property>
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="spacing">5</property>
                                                         <child>
-                                                          <object class="GtkImage">
+                                                          <object class="GtkButton" id="btnAddUser">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
+                                                            <property name="receives-default">True</property>
+                                                            <child>
+                                                            <object class="GtkImage">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">value-increase-symbolic</property>
+                                                            </object>
+                                                            </child>
+                                                            <style>
+                                                            <class name="thin"/>
+                                                            </style>
                                                           </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">0</property>
+                                                          </packing>
                                                         </child>
-                                                        <style>
-                                                          <class name="thin"/>
-                                                        </style>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">False</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">0</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkButton" id="btnEditUser">
-                                                        <property name="visible">True</property>
-                                                        <property name="can-focus">True</property>
-                                                        <property name="receives-default">True</property>
                                                         <child>
-                                                          <object class="GtkImage">
+                                                          <object class="GtkButton" id="btnEditUser">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
+                                                            <property name="receives-default">True</property>
+                                                            <child>
+                                                            <object class="GtkImage">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">document-edit-symbolic</property>
+                                                            </object>
+                                                            </child>
+                                                            <style>
+                                                            <class name="thin"/>
+                                                            </style>
                                                           </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
                                                         </child>
-                                                        <style>
-                                                          <class name="thin"/>
-                                                        </style>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">False</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">1</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkButton" id="btnRemoveUser">
-                                                        <property name="visible">True</property>
-                                                        <property name="can-focus">True</property>
-                                                        <property name="receives-default">True</property>
                                                         <child>
-                                                          <object class="GtkImage">
+                                                          <object class="GtkButton" id="btnRemoveUser">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
+                                                            <property name="receives-default">True</property>
+                                                            <child>
+                                                            <object class="GtkImage">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">user-trash-symbolic</property>
+                                                            </object>
+                                                            </child>
+                                                            <style>
+                                                            <class name="thin"/>
+                                                            </style>
                                                           </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">2</property>
+                                                          </packing>
                                                         </child>
-                                                        <style>
-                                                          <class name="thin"/>
-                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
                                                         <property name="fill">True</property>
-                                                        <property name="position">2</property>
+                                                        <property name="position">1</property>
                                                       </packing>
                                                     </child>
                                                   </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
                                                 </child>
                                               </object>
                                             </child>
@@ -808,7 +798,7 @@
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
+                                            <property name="expand">True</property>
                                             <property name="fill">True</property>
                                             <property name="position">5</property>
                                           </packing>
@@ -817,23 +807,22 @@
                                           <object class="GtkFrame">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="margin-left">5</property>
-                                            <property name="margin-right">10</property>
                                             <property name="margin-bottom">5</property>
                                             <property name="label-xalign">0.019999999552965164</property>
                                             <property name="shadow-type">in</property>
                                             <child>
-                                              <object class="GtkBox">
+                                              <object class="GtkAlignment">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
-                                                <property name="margin-end">5</property>
-                                                <property name="margin-bottom">5</property>
-                                                <property name="spacing">5</property>
+                                                <property name="left-padding">5</property>
                                                 <child>
-                                                  <object class="GtkAlignment">
+                                                  <object class="GtkBox">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">False</property>
-                                                    <property name="left-padding">5</property>
+                                                    <property name="margin-right">5</property>
+                                                    <property name="margin-end">5</property>
+                                                    <property name="margin-bottom">5</property>
+                                                    <property name="spacing">5</property>
                                                     <child>
                                                       <object class="GtkBox">
                                                         <property name="visible">True</property>
@@ -845,10 +834,6 @@
                                                             <property name="can-focus">True</property>
                                                             <property name="shadow-type">in</property>
                                                             <child>
-                                                            <object class="GtkViewport">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">False</property>
-                                                            <child>
                                                             <object class="GtkTreeView" id="treeViewMelody">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
@@ -857,8 +842,6 @@
                                                             </child>
                                                             </object>
                                                             </child>
-                                                            </object>
-                                                            </child>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">True</property>
@@ -867,98 +850,92 @@
                                                           </packing>
                                                         </child>
                                                       </object>
+                                                      <packing>
+                                                        <property name="expand">True</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
                                                     </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkBox">
-                                                    <property name="visible">True</property>
-                                                    <property name="can-focus">False</property>
-                                                    <property name="orientation">vertical</property>
-                                                    <property name="spacing">5</property>
                                                     <child>
-                                                      <object class="GtkButton" id="btnAddMusic">
+                                                      <object class="GtkBox">
                                                         <property name="visible">True</property>
-                                                        <property name="can-focus">True</property>
-                                                        <property name="receives-default">True</property>
-                                                        <property name="margin-left">5</property>
-                                                        <property name="margin-right">10</property>
+                                                        <property name="can-focus">False</property>
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="spacing">5</property>
                                                         <child>
-                                                          <object class="GtkImage">
+                                                          <object class="GtkButton" id="btnAddMusic">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
+                                                            <property name="receives-default">True</property>
+                                                            <child>
+                                                            <object class="GtkImage">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">value-increase-symbolic</property>
+                                                            </object>
+                                                            </child>
+                                                            <style>
+                                                            <class name="thin"/>
+                                                            </style>
                                                           </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">0</property>
+                                                          </packing>
                                                         </child>
-                                                        <style>
-                                                          <class name="thin"/>
-                                                        </style>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">False</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">0</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkButton" id="btnEditMusic">
-                                                        <property name="visible">True</property>
-                                                        <property name="can-focus">True</property>
-                                                        <property name="receives-default">True</property>
-                                                        <property name="margin-left">5</property>
-                                                        <property name="margin-right">10</property>
                                                         <child>
-                                                          <object class="GtkImage">
+                                                          <object class="GtkButton" id="btnEditMusic">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
+                                                            <property name="receives-default">True</property>
+                                                            <child>
+                                                            <object class="GtkImage">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">document-edit-symbolic</property>
+                                                            </object>
+                                                            </child>
+                                                            <style>
+                                                            <class name="thin"/>
+                                                            </style>
                                                           </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
                                                         </child>
-                                                        <style>
-                                                          <class name="thin"/>
-                                                        </style>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">False</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">1</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkButton" id="btnRemoveMusic">
-                                                        <property name="visible">True</property>
-                                                        <property name="can-focus">True</property>
-                                                        <property name="receives-default">True</property>
-                                                        <property name="margin-left">5</property>
-                                                        <property name="margin-right">10</property>
                                                         <child>
-                                                          <object class="GtkImage">
+                                                          <object class="GtkButton" id="btnRemoveMusic">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
+                                                            <property name="receives-default">True</property>
+                                                            <child>
+                                                            <object class="GtkImage">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">user-trash-symbolic</property>
+                                                            </object>
+                                                            </child>
+                                                            <style>
+                                                            <class name="thin"/>
+                                                            </style>
                                                           </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">2</property>
+                                                          </packing>
                                                         </child>
-                                                        <style>
-                                                          <class name="thin"/>
-                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
                                                         <property name="fill">True</property>
-                                                        <property name="position">2</property>
+                                                        <property name="position">1</property>
                                                       </packing>
                                                     </child>
                                                   </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
                                                 </child>
                                               </object>
                                             </child>
@@ -979,7 +956,7 @@
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
+                                            <property name="expand">True</property>
                                             <property name="fill">True</property>
                                             <property name="position">5</property>
                                           </packing>
@@ -1017,12 +994,6 @@
                           <object class="GtkFrame">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
-                            <property name="margin-right">5</property>
-                            <property name="margin-start">5</property>
-                            <property name="margin-end">5</property>
-                            <property name="margin-top">5</property>
-                            <property name="margin-bottom">5</property>
                             <property name="label-xalign">0.019999999552965164</property>
                             <property name="shadow-type">in</property>
                             <child>
@@ -1039,19 +1010,12 @@
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkScrolledWindow">
+                                      <object class="GtkTreeView" id="treeViewKernel">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="shadow-type">in</property>
-                                        <child>
-                                          <object class="GtkTreeView" id="treeViewKernel">
-                                            <property name="visible">True</property>
-                                            <property name="can-focus">True</property>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
+                                        <property name="expand">False</property>
                                         <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
@@ -1124,12 +1088,6 @@
                           <object class="GtkFrame">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
-                            <property name="margin-right">5</property>
-                            <property name="margin-start">5</property>
-                            <property name="margin-end">5</property>
-                            <property name="margin-top">5</property>
-                            <property name="margin-bottom">5</property>
                             <property name="label-xalign">0.019999999552965164</property>
                             <property name="shadow-type">in</property>
                             <child>
@@ -1146,24 +1104,14 @@
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkScrolledWindow">
-                                        <property name="height-request">140</property>
+                                      <object class="GtkTreeView" id="treeViewIPT">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="margin-left">5</property>
-                                        <property name="margin-right">10</property>
-                                        <property name="shadow-type">in</property>
-                                        <child>
-                                          <object class="GtkTreeView" id="treeViewIPT">
-                                            <property name="visible">True</property>
-                                            <property name="can-focus">True</property>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">True</property>
-                                        <property name="position">1</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1235,12 +1183,6 @@
                           <object class="GtkFrame">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
-                            <property name="margin-right">5</property>
-                            <property name="margin-start">5</property>
-                            <property name="margin-end">5</property>
-                            <property name="margin-top">5</property>
-                            <property name="margin-bottom">5</property>
                             <property name="label-xalign">0.019999999552965164</property>
                             <property name="shadow-type">in</property>
                             <child>
@@ -1257,25 +1199,9 @@
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkScrolledWindow">
+                                      <object class="GtkTreeView" id="treeViewOTT">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="shadow-type">in</property>
-                                        <child>
-                                          <object class="GtkViewport">
-                                            <property name="visible">True</property>
-                                            <property name="can-focus">False</property>
-                                            <child>
-                                              <object class="GtkTreeView" id="treeViewOTT">
-                                                <property name="visible">True</property>
-                                                <property name="can-focus">True</property>
-                                                <child internal-child="selection">
-                                                  <object class="GtkTreeSelection"/>
-                                                </child>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1293,8 +1219,6 @@
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
                                             <property name="valign">center</property>
-                                            <property name="margin-left">5</property>
-                                            <property name="margin-right">5</property>
                                             <property name="label" translatable="yes">Command line parameters:</property>
                                           </object>
                                           <packing>
@@ -1308,8 +1232,6 @@
                                             <property name="visible">True</property>
                                             <property name="can-focus">True</property>
                                             <property name="valign">center</property>
-                                            <property name="margin-left">5</property>
-                                            <property name="margin-right">10</property>
                                             <property name="margin-top">5</property>
                                             <property name="margin-bottom">5</property>
                                           </object>