diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade
index 0732620..adac17b 100644
--- a/ubl-settings-bootloader.glade
+++ b/ubl-settings-bootloader.glade
@@ -656,6 +656,9 @@
                                                           <object class="GtkTreeView" id="treeViewUser">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
+                                                            <child internal-child="selection">
+                                                            <object class="GtkTreeSelection"/>
+                                                            </child>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">True</property>
@@ -799,6 +802,9 @@
                                                       <object class="GtkTreeView" id="treeViewMelody">
                                                         <property name="visible">True</property>
                                                         <property name="can-focus">True</property>
+                                                        <child internal-child="selection">
+                                                          <object class="GtkTreeSelection"/>
+                                                        </child>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">True</property>
@@ -963,6 +969,9 @@
                                       <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>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1057,6 +1066,9 @@
                                       <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>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1152,6 +1164,9 @@
                                       <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>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1253,6 +1268,8 @@
           <object class="GtkLabel" id="lblHeaderName">
             <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="label" translatable="yes">System boot</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -1263,6 +1280,8 @@
           <object class="GtkImage">
             <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="pixel-size">32</property>
             <property name="icon-name">com.ublinux.ubl-settings-bootloader</property>
           </object>
@@ -1338,11 +1357,7 @@
                     <property name="popup">menu1</property>
                     <property name="direction">none</property>
                     <child>
-                      <object class="GtkImage" id="imgSettings">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="icon-name">open-menu-symbolic</property>
-                      </object>
+                      <placeholder/>
                     </child>
                   </object>
                   <packing>