diff --git a/.gitignore b/.gitignore
index 2288297..e367c25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ test.cpp
 .vscode
 ubl-settings-bootloader
 ubl-settings-bootloader_ru.po~
-terminal-commands/
\ No newline at end of file
+terminal-commands/
+compile/
\ No newline at end of file
diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade
index 591a6d9..4ce5f58 100644
--- a/ubl-settings-bootloader.glade
+++ b/ubl-settings-bootloader.glade
@@ -435,18 +435,13 @@
           <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">
@@ -458,6 +453,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="GtkFrame">
                             <property name="visible">True</property>
@@ -468,7 +464,9 @@
                               <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="GtkOverlay" id="overMenuOS">
                                     <property name="visible">True</property>
@@ -637,15 +635,13 @@
                                               <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="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">
@@ -653,11 +649,19 @@
                                                         <property name="can-focus">False</property>
                                                         <property name="orientation">vertical</property>
                                                         <child>
-                                                          <object class="GtkTreeView" id="treeViewUser">
+                                                          <object class="GtkFrame">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <property name="label-xalign">0</property>
+                                                            <property name="shadow-type">in</property>
+                                                            <child>
+                                                            <object class="GtkTreeView" id="treeViewUser">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
-                                                            <child internal-child="selection">
-                                                            <object class="GtkTreeSelection"/>
+                                                            </object>
+                                                            </child>
+                                                            <child type="label_item">
+                                                            <placeholder/>
                                                             </child>
                                                           </object>
                                                           <packing>
@@ -761,12 +765,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">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">Boot Menu Users</property>
                                                 <property name="ellipsize">start</property>
                                               </object>
@@ -782,28 +780,34 @@
                                           <object class="GtkFrame">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="margin-bottom">5</property>
                                             <property name="label-xalign">0.019999999552965164</property>
                                             <property name="shadow-type">in</property>
                                             <child>
                                               <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="margin-right">5</property>
-                                                    <property name="margin-end">5</property>
-                                                    <property name="margin-bottom">5</property>
                                                     <property name="spacing">5</property>
                                                     <child>
-                                                      <object class="GtkTreeView" id="treeViewMelody">
+                                                      <object class="GtkFrame">
                                                         <property name="visible">True</property>
-                                                        <property name="can-focus">True</property>
-                                                        <child internal-child="selection">
-                                                          <object class="GtkTreeSelection"/>
+                                                        <property name="can-focus">False</property>
+                                                        <property name="label-xalign">0</property>
+                                                        <property name="shadow-type">in</property>
+                                                        <child>
+                                                          <object class="GtkTreeView" id="treeViewMelody">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">True</property>
+                                                          </object>
+                                                        </child>
+                                                        <child type="label_item">
+                                                          <placeholder/>
                                                         </child>
                                                       </object>
                                                       <packing>
@@ -900,12 +904,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">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">Ringtone at startup</property>
                                                 <property name="ellipsize">start</property>
                                               </object>
@@ -930,12 +928,6 @@
                               <object class="GtkLabel" id="lblLoadMenu">
                                 <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">Download menu</property>
                               </object>
                             </child>
@@ -975,9 +967,6 @@
                                           <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>
                                       </object>
@@ -1034,12 +1023,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">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">Parameters passed to the kernel</property>
                                 <property name="ellipsize">start</property>
                               </object>
@@ -1071,11 +1054,19 @@
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkTreeView" id="treeViewIPT">
+                                      <object class="GtkFrame">
                                         <property name="visible">True</property>
-                                        <property name="can-focus">True</property>
-                                        <child internal-child="selection">
-                                          <object class="GtkTreeSelection"/>
+                                        <property name="can-focus">False</property>
+                                        <property name="label-xalign">0</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>
+                                        <child type="label_item">
+                                          <placeholder/>
                                         </child>
                                       </object>
                                       <packing>
@@ -1132,12 +1123,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">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">Terminal for input</property>
                                 <property name="ellipsize">start</property>
                               </object>
@@ -1169,11 +1154,19 @@
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkTreeView" id="treeViewOTT">
+                                      <object class="GtkFrame">
                                         <property name="visible">True</property>
-                                        <property name="can-focus">True</property>
-                                        <child internal-child="selection">
-                                          <object class="GtkTreeSelection"/>
+                                        <property name="can-focus">False</property>
+                                        <property name="label-xalign">0</property>
+                                        <property name="shadow-type">in</property>
+                                        <child>
+                                          <object class="GtkTreeView" id="treeViewOTT">
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">True</property>
+                                          </object>
+                                        </child>
+                                        <child type="label_item">
+                                          <placeholder/>
                                         </child>
                                       </object>
                                       <packing>
@@ -1230,12 +1223,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">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">Terminal for output</property>
                                 <property name="ellipsize">start</property>
                               </object>
@@ -1701,22 +1688,21 @@
       <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-top">5</property>
+        <property name="margin-bottom">5</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="spacing">5</property>
             <child>
               <object class="GtkLabel" id="lblAddEditCheckBox">
                 <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">label</property>
                 <property name="xalign">0</property>
               </object>
@@ -1731,12 +1717,6 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">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">7</property>
-                <property name="margin-bottom">5</property>
                 <property name="draw-indicator">True</property>
                 <child>
                   <placeholder/>
@@ -1760,20 +1740,16 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">5</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel" id="lblAddEditCol1">
                     <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">label</property>
                     <property name="xalign">0</property>
                   </object>
@@ -1787,12 +1763,6 @@
                   <object class="GtkEntry" id="entryCol1">
                     <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">True</property>
@@ -1811,16 +1781,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="lblAddEditCol2">
                     <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">label</property>
                     <property name="xalign">0</property>
                   </object>
@@ -1834,12 +1799,6 @@
                   <object class="GtkEntry" id="entryCol2">
                     <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">True</property>
@@ -1865,6 +1824,7 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="spacing">5</property>
             <child>
               <object class="GtkLabel" id="lblEditSpace">
                 <property name="visible">True</property>
@@ -1882,12 +1842,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">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="use-stock">True</property>
               </object>
               <packing>
@@ -1903,12 +1857,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">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="use-stock">True</property>
               </object>
               <packing>