diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 518dc71..7309bc4 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -825,7 +825,6 @@ agreement</property>
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="tab-pos">left</property>
-                    <property name="show-tabs">False</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
@@ -7740,7 +7739,7 @@ or continue working in the system Live environment.</property>
                                                             <property name="has-entry">True</property>
                                                             <child internal-child="entry">
                                                             <object class="GtkEntry">
-                                                            <property name="can-focus">False</property>
+                                                            <property name="can-focus">True</property>
                                                             </object>
                                                             </child>
                                                             </object>
@@ -12033,10 +12032,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label4">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Size:</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12045,15 +12045,20 @@ separately into the selected partition.</property>
                                                             </packing>
                                                             </child>
                                                             <child>
+                                                            <object class="GtkBox" id="box2">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <property name="spacing">5</property>
+                                                            <child>
                                                             <object class="GtkSpinButton" id="OSFormatSizeSpin">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
                                                             <property name="adjustment">PartitionSize</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12070,19 +12075,39 @@ separately into the selected partition.</property>
                                                             <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">3</property>
                                                             </packing>
                                                             </child>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</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="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label9">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Partition label:</property>
+                                                            <property name="xalign">0.30000001192092896</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</property>
+                                                            <property name="position">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12093,14 +12118,14 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">4</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12109,10 +12134,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label1">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">File system type:</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12126,6 +12152,11 @@ separately into the selected partition.</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="can-focus">True</property>
+                                                            </object>
+                                                            </child>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12137,7 +12168,7 @@ separately into the selected partition.</property>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">2</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12146,10 +12177,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label3">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">File system label:</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12172,7 +12204,7 @@ separately into the selected partition.</property>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">2</property>
+                                                            <property name="position">3</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12249,7 +12281,7 @@ separately into the selected partition.</property>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</property>
+                                                            <property name="position">4</property>
                                                           </packing>
                                                         </child>
                                                       </object>
@@ -12812,10 +12844,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label10">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Size:</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12824,6 +12857,11 @@ separately into the selected partition.</property>
                                                             </packing>
                                                             </child>
                                                             <child>
+                                                            <object class="GtkBox" id="box3">
+                                                            <property name="visible">True</property>
+                                                            <property name="can-focus">False</property>
+                                                            <property name="spacing">5</property>
+                                                            <child>
                                                             <object class="GtkSpinButton" id="UserdataFormatSizeSpin">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
@@ -12832,9 +12870,9 @@ separately into the selected partition.</property>
                                                             <property name="value">16</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">False</property>
+                                                            <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12851,19 +12889,39 @@ separately into the selected partition.</property>
                                                             <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">3</property>
+                                                            </packing>
+                                                            </child>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</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="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label13">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">Partition label:</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</property>
+                                                            <property name="position">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -12874,14 +12932,14 @@ separately into the selected partition.</property>
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">4</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12890,10 +12948,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label11">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">File system type:</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12907,6 +12966,11 @@ separately into the selected partition.</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="can-focus">True</property>
+                                                            </object>
+                                                            </child>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12918,7 +12982,7 @@ separately into the selected partition.</property>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">2</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -12927,10 +12991,11 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="spacing">5</property>
                                                             <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="label12">
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="label" translatable="yes">File system label:</property>
+                                                            <property name="xalign">0</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -12953,7 +13018,7 @@ separately into the selected partition.</property>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">2</property>
+                                                            <property name="position">3</property>
                                                           </packing>
                                                         </child>
                                                         <child>
@@ -13030,7 +13095,7 @@ separately into the selected partition.</property>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">3</property>
+                                                            <property name="position">4</property>
                                                           </packing>
                                                         </child>
                                                       </object>
@@ -13443,6 +13508,30 @@ separately into the selected partition.</property>
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="OsOnlySizeGroup">
+    <widgets>
+      <widget name="box2"/>
+      <widget name="OSFilesystemTypeCombo"/>
+      <widget name="OSFormatFSMarkEntry"/>
+      <widget name="OSFormatPartitionEntry"/>
+      <widget name="UserdataFormatPartitionEntry"/>
+      <widget name="UserdataFormatFSMarkEntry"/>
+      <widget name="UserdataFilesystemTypeCombo"/>
+      <widget name="box3"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="label1"/>
+      <widget name="label3"/>
+      <widget name="label4"/>
+      <widget name="label9"/>
+      <widget name="label10"/>
+      <widget name="label11"/>
+      <widget name="label12"/>
+      <widget name="label13"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup">
     <widgets>
       <widget name="box1"/>