diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade
index f68863d..82dc707 100644
--- a/ubl-settings-bootloader.glade
+++ b/ubl-settings-bootloader.glade
@@ -9,6 +9,7 @@
   </object>
   <object class="GtkSizeGroup"/>
   <object class="GtkSizeGroup"/>
+  <object class="GtkSizeGroup"/>
   <object class="GtkAboutDialog" id="aboutWindows">
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
@@ -354,8 +355,8 @@
     </child>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="width-request">784</property>
-    <property name="height-request">556</property>
+    <property name="width-request">800</property>
+    <property name="height-request">600</property>
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.ubl-settings-bootloader</property>
     <child>
@@ -441,6 +442,7 @@
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>
             <property name="can-focus">True</property>
+            <property name="hscrollbar-policy">never</property>
             <property name="shadow-type">in</property>
             <child>
               <object class="GtkViewport">
@@ -481,11 +483,13 @@
                                       <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
+                                        <property name="margin-end">5</property>
                                         <property name="orientation">vertical</property>
                                         <child>
                                           <object class="GtkBox">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
+                                            <property name="spacing">5</property>
                                             <child>
                                               <object class="GtkCheckButton" id="chbLoadVariantSelectionTimer">
                                                 <property name="label" translatable="yes">Boot selection menu timer</property>
@@ -494,10 +498,6 @@
                                                 <property name="receives-default">False</property>
                                                 <property name="margin-left">3</property>
                                                 <property name="margin-right">5</property>
-                                                <property name="margin-start">3</property>
-                                                <property name="margin-end">5</property>
-                                                <property name="margin-top">5</property>
-                                                <property name="margin-bottom">5</property>
                                                 <property name="draw-indicator">True</property>
                                               </object>
                                               <packing>
@@ -510,12 +510,6 @@
                                               <object class="GtkSpinButton" id="spbSecond">
                                                 <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-start">5</property>
-                                                <property name="margin-end">5</property>
-                                                <property name="margin-top">5</property>
-                                                <property name="margin-bottom">5</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -527,12 +521,6 @@
                                               <object class="GtkLabel" id="lblInfoSeconds">
                                                 <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" translatable="yes">Seconds</property>
                                               </object>
                                               <packing>
@@ -552,17 +540,14 @@
                                           <object class="GtkBox">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
+                                            <property name="spacing">5</property>
                                             <child>
                                               <object class="GtkLabel" id="lblInfoDefaultDonw">
                                                 <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="margin-right">4</property>
                                                 <property name="label" translatable="yes">Default load</property>
                                                 <property name="ellipsize">start</property>
                                                 <property name="xalign">0</property>
@@ -579,8 +564,6 @@
                                                 <property name="can-focus">True</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>
                                               </object>
@@ -595,10 +578,6 @@
                                                 <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="margin-start">5</property>
-                                                <property name="margin-end">10</property>
                                                 <property name="margin-top">5</property>
                                                 <property name="margin-bottom">5</property>
                                                 <child>
@@ -654,7 +633,6 @@
                                                 <property name="margin-left">5</property>
                                                 <property name="margin-right">10</property>
                                                 <property name="margin-start">5</property>
-                                                <property name="margin-end">10</property>
                                                 <property name="margin-top">5</property>
                                                 <property name="margin-bottom">5</property>
                                               </object>
@@ -677,21 +655,20 @@
                                             <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-end">10</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>
                                               <object class="GtkBox">
                                                 <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">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">False</property>
-                                                    <property name="left-padding">5</property>
                                                     <child>
                                                       <object class="GtkBox">
                                                         <property name="visible">True</property>
@@ -699,14 +676,8 @@
                                                         <property name="orientation">vertical</property>
                                                         <child>
                                                           <object class="GtkScrolledWindow">
-                                                            <property name="height-request">100</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
-                                                            <property name="margin-left">5</property>
-                                                            <property name="margin-right">3</property>
-                                                            <property name="margin-start">5</property>
-                                                            <property name="margin-end">3</property>
-                                                            <property name="margin-top">5</property>
                                                             <property name="shadow-type">in</property>
                                                             <child>
                                                             <object class="GtkViewport">
@@ -725,7 +696,7 @@
                                                             </child>
                                                           </object>
                                                           <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
                                                             <property name="position">0</property>
                                                           </packing>
@@ -744,17 +715,12 @@
                                                     <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">
                                                         <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="margin-start">5</property>
-                                                        <property name="margin-end">10</property>
-                                                        <property name="margin-top">5</property>
-                                                        <property name="margin-bottom">5</property>
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
@@ -762,6 +728,9 @@
                                                             <property name="icon-name">value-increase-symbolic</property>
                                                           </object>
                                                         </child>
+                                                        <style>
+                                                          <class name="thin"/>
+                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -774,12 +743,6 @@
                                                         <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="margin-start">5</property>
-                                                        <property name="margin-end">10</property>
-                                                        <property name="margin-top">3</property>
-                                                        <property name="margin-bottom">5</property>
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
@@ -787,6 +750,9 @@
                                                             <property name="icon-name">document-edit-symbolic</property>
                                                           </object>
                                                         </child>
+                                                        <style>
+                                                          <class name="thin"/>
+                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -799,12 +765,6 @@
                                                         <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="margin-start">5</property>
-                                                        <property name="margin-end">10</property>
-                                                        <property name="margin-top">3</property>
-                                                        <property name="margin-bottom">10</property>
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
@@ -812,6 +772,9 @@
                                                             <property name="icon-name">user-trash-symbolic</property>
                                                           </object>
                                                         </child>
+                                                        <style>
+                                                          <class name="thin"/>
+                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -856,9 +819,6 @@
                                             <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-end">10</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>
@@ -866,6 +826,9 @@
                                               <object class="GtkBox">
                                                 <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>
                                                 <child>
                                                   <object class="GtkAlignment">
                                                     <property name="visible">True</property>
@@ -878,14 +841,8 @@
                                                         <property name="orientation">vertical</property>
                                                         <child>
                                                           <object class="GtkScrolledWindow">
-                                                            <property name="height-request">100</property>
                                                             <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-start">5</property>
-                                                            <property name="margin-end">5</property>
-                                                            <property name="margin-top">5</property>
                                                             <property name="shadow-type">in</property>
                                                             <child>
                                                             <object class="GtkViewport">
@@ -904,7 +861,7 @@
                                                             </child>
                                                           </object>
                                                           <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
                                                             <property name="position">0</property>
                                                           </packing>
@@ -923,6 +880,7 @@
                                                     <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">
                                                         <property name="visible">True</property>
@@ -930,10 +888,6 @@
                                                         <property name="receives-default">True</property>
                                                         <property name="margin-left">5</property>
                                                         <property name="margin-right">10</property>
-                                                        <property name="margin-start">5</property>
-                                                        <property name="margin-end">10</property>
-                                                        <property name="margin-top">5</property>
-                                                        <property name="margin-bottom">5</property>
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
@@ -941,6 +895,9 @@
                                                             <property name="icon-name">value-increase-symbolic</property>
                                                           </object>
                                                         </child>
+                                                        <style>
+                                                          <class name="thin"/>
+                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -955,10 +912,6 @@
                                                         <property name="receives-default">True</property>
                                                         <property name="margin-left">5</property>
                                                         <property name="margin-right">10</property>
-                                                        <property name="margin-start">5</property>
-                                                        <property name="margin-end">10</property>
-                                                        <property name="margin-top">3</property>
-                                                        <property name="margin-bottom">5</property>
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
@@ -966,6 +919,9 @@
                                                             <property name="icon-name">document-edit-symbolic</property>
                                                           </object>
                                                         </child>
+                                                        <style>
+                                                          <class name="thin"/>
+                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -980,10 +936,6 @@
                                                         <property name="receives-default">True</property>
                                                         <property name="margin-left">5</property>
                                                         <property name="margin-right">10</property>
-                                                        <property name="margin-start">5</property>
-                                                        <property name="margin-end">10</property>
-                                                        <property name="margin-top">3</property>
-                                                        <property name="margin-bottom">10</property>
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
@@ -991,6 +943,9 @@
                                                             <property name="icon-name">user-trash-symbolic</property>
                                                           </object>
                                                         </child>
+                                                        <style>
+                                                          <class name="thin"/>
+                                                        </style>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -1074,42 +1029,29 @@
                               <object class="GtkAlignment">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
+                                <property name="bottom-padding">5</property>
                                 <property name="left-padding">5</property>
+                                <property name="right-padding">5</property>
                                 <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="GtkScrolledWindow">
-                                        <property name="height-request">140</property>
                                         <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="margin-start">5</property>
-                                        <property name="margin-end">10</property>
-                                        <property name="margin-top">5</property>
-                                        <property name="margin-bottom">5</property>
                                         <property name="shadow-type">in</property>
                                         <child>
-                                          <object class="GtkViewport">
+                                          <object class="GtkTreeView" id="treeViewKernel">
                                             <property name="visible">True</property>
-                                            <property name="can-focus">False</property>
-                                            <child>
-                                              <object class="GtkTreeView" id="treeViewKernel">
-                                                <property name="visible">True</property>
-                                                <property name="can-focus">True</property>
-                                                <child internal-child="selection">
-                                                  <object class="GtkTreeSelection"/>
-                                                </child>
-                                              </object>
-                                            </child>
+                                            <property name="can-focus">True</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
+                                        <property name="expand">True</property>
                                         <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
@@ -1118,16 +1060,11 @@
                                       <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
+                                        <property name="spacing">5</property>
                                         <child>
                                           <object class="GtkLabel" id="lblInfoCommand">
                                             <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">1</property>
-                                            <property name="margin-bottom">5</property>
                                             <property name="label" translatable="yes">Command line parameters:</property>
                                           </object>
                                           <packing>
@@ -1140,10 +1077,7 @@
                                           <object class="GtkEntry" id="entryKernel">
                                             <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="margin-start">5</property>
-                                            <property name="margin-end">10</property>
+                                            <property name="valign">center</property>
                                             <property name="margin-top">5</property>
                                             <property name="margin-bottom">5</property>
                                           </object>
@@ -1202,12 +1136,15 @@
                               <object class="GtkAlignment">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
+                                <property name="bottom-padding">5</property>
                                 <property name="left-padding">5</property>
+                                <property name="right-padding">5</property>
                                 <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="GtkScrolledWindow">
                                         <property name="height-request">140</property>
@@ -1215,24 +1152,11 @@
                                         <property name="can-focus">True</property>
                                         <property name="margin-left">5</property>
                                         <property name="margin-right">10</property>
-                                        <property name="margin-start">5</property>
-                                        <property name="margin-end">10</property>
-                                        <property name="margin-top">5</property>
-                                        <property name="margin-bottom">5</property>
                                         <property name="shadow-type">in</property>
                                         <child>
-                                          <object class="GtkViewport">
+                                          <object class="GtkTreeView" id="treeViewIPT">
                                             <property name="visible">True</property>
-                                            <property name="can-focus">False</property>
-                                            <child>
-                                              <object class="GtkTreeView" id="treeViewIPT">
-                                                <property name="visible">True</property>
-                                                <property name="can-focus">True</property>
-                                                <child internal-child="selection">
-                                                  <object class="GtkTreeSelection"/>
-                                                </child>
-                                              </object>
-                                            </child>
+                                            <property name="can-focus">True</property>
                                           </object>
                                         </child>
                                       </object>
@@ -1246,16 +1170,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="lblInfoCommand1">
                                             <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">1</property>
-                                            <property name="margin-bottom">5</property>
+                                            <property name="valign">center</property>
                                             <property name="label" translatable="yes">Command line parameters:</property>
                                           </object>
                                           <packing>
@@ -1268,10 +1188,7 @@
                                           <object class="GtkEntry" id="entryIPT">
                                             <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="margin-start">5</property>
-                                            <property name="margin-end">10</property>
+                                            <property name="valign">center</property>
                                             <property name="margin-top">5</property>
                                             <property name="margin-bottom">5</property>
                                           </object>
@@ -1330,23 +1247,19 @@
                               <object class="GtkAlignment">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
+                                <property name="bottom-padding">5</property>
                                 <property name="left-padding">5</property>
+                                <property name="right-padding">5</property>
                                 <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="GtkScrolledWindow">
-                                        <property name="height-request">140</property>
                                         <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="margin-start">5</property>
-                                        <property name="margin-end">10</property>
-                                        <property name="margin-top">5</property>
-                                        <property name="margin-bottom">5</property>
                                         <property name="shadow-type">in</property>
                                         <child>
                                           <object class="GtkViewport">
@@ -1374,16 +1287,14 @@
                                       <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
+                                        <property name="spacing">5</property>
                                         <child>
                                           <object class="GtkLabel" id="lblInfoCommand2">
                                             <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="margin-start">5</property>
-                                            <property name="margin-end">5</property>
-                                            <property name="margin-top">1</property>
-                                            <property name="margin-bottom">5</property>
                                             <property name="label" translatable="yes">Command line parameters:</property>
                                           </object>
                                           <packing>
@@ -1396,10 +1307,9 @@
                                           <object class="GtkEntry" id="entryOTT">
                                             <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-start">5</property>
-                                            <property name="margin-end">10</property>
                                             <property name="margin-top">5</property>
                                             <property name="margin-bottom">5</property>
                                           </object>
@@ -1670,13 +1580,6 @@
       <widget name="entryOTT"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup">
-    <widgets>
-      <widget name="treeViewKernel"/>
-      <widget name="treeViewIPT"/>
-      <widget name="treeViewOTT"/>
-    </widgets>
-  </object>
   <object class="GtkWindow" id="mess_sudo">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Внимание!</property>