diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index e065d77..eb62d10 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -514,7 +514,7 @@
     <property name="reserve-toggle-size">False</property>
   </object>
   <object class="GtkWindow" id="MainWindow">
-    <property name="width-request">800</property>
+    <property name="width-request">750</property>
     <property name="height-request">500</property>
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -776,16 +776,14 @@ agreement</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</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="GtkNotebook" id="Notebook">
                     <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-top">5</property>
-                    <property name="margin-bottom">5</property>
                     <property name="tab-pos">left</property>
                     <property name="show-tabs">False</property>
                     <child>
@@ -1374,6 +1372,7 @@ agreement</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="margin-start">5</property>
                                                         <property name="label" translatable="yes">Deleting all data on the selected disk and then installing the system</property>
+                                                        <property name="wrap">True</property>
                                                         <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
@@ -1451,6 +1450,7 @@ agreement</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="margin-start">5</property>
                                                         <property name="label" translatable="yes">Shrinking a partition and creating a new one for installing OS</property>
+                                                        <property name="wrap">True</property>
                                                         <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
@@ -1528,6 +1528,7 @@ agreement</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="margin-start">5</property>
                                                         <property name="label" translatable="yes">Unpacking into an existing system</property>
+                                                        <property name="wrap">True</property>
                                                         <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
@@ -1605,6 +1606,7 @@ agreement</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="margin-start">5</property>
                                                         <property name="label" translatable="yes">Installing OS files, user data on different partitions, creating RAID, etc.</property>
+                                                        <property name="wrap">True</property>
                                                         <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
@@ -1682,6 +1684,7 @@ agreement</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="margin-start">5</property>
                                                         <property name="label" translatable="yes">Recovering bootloader, OS files, user data</property>
+                                                        <property name="wrap">True</property>
                                                         <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
@@ -5074,6 +5077,9 @@ agreement</property>
                                     <property name="can-focus">True</property>
                                     <property name="model">StartupList</property>
                                     <property name="enable-grid-lines">both</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection"/>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn">
                                         <property name="title" translatable="yes">Autostart</property>
@@ -5892,14 +5898,14 @@ agreement</property>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
+                                <property name="expand">True</property>
                                 <property name="fill">True</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">3</property>
                           </packing>
@@ -6031,7 +6037,6 @@ agreement</property>
                         </child>
                         <child>
                           <object class="GtkBox">
-                            <property name="height-request">350</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
@@ -6354,7 +6359,7 @@ agreement</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">3</property>
                           </packing>
@@ -7053,8 +7058,6 @@ or continue working in the environment, booted from the Live image.</property>
                               <object class="GtkViewport">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="margin-end">10</property>
-                                <property name="margin-bottom">5</property>
                                 <child>
                                   <object class="GtkBox">
                                     <property name="visible">True</property>
@@ -7429,12 +7432,6 @@ or continue working in the environment, booted from the Live image.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
                                                             <property name="has-entry">True</property>
-                                                            <child internal-child="entry">
-                                                            <object class="GtkEntry">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">True</property>
-                                                            </object>
-                                                            </child>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -7523,8 +7520,6 @@ or continue working in the environment, booted from the Live image.</property>
                               <object class="GtkViewport">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="margin-end">10</property>
-                                <property name="margin-bottom">5</property>
                                 <child>
                                   <object class="GtkBox">
                                     <property name="visible">True</property>
@@ -8206,8 +8201,6 @@ or continue working in the environment, booted from the Live image.</property>
                               <object class="GtkViewport">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="margin-end">10</property>
-                                <property name="margin-bottom">5</property>
                                 <child>
                                   <object class="GtkBox">
                                     <property name="visible">True</property>
@@ -9761,6 +9754,7 @@ separately into the selected partition.</property>
                                                             <property name="visible">True</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="can-focus">True</property>
+                                                            <property name="orientation">vertical</property>
                                                             <property name="adjustment">AdvancedSwapAdjustment</property>
                                                             </object>
                                                             <packing>