diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c
index b35eb2b..14b2466 100644
--- a/source/ubinstall-gtk-installation.c
+++ b/source/ubinstall-gtk-installation.c
@@ -499,9 +499,6 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
             yon_char_parsed_free(encryptions,size);
             gtk_combo_box_set_active(GTK_COMBO_BOX(partition_encryption_combo),0);
         }
-        char *format = config(part_format_parameter);
-        if ((!yon_char_is_empty(format)&&!strcmp(format,"yes"))||!gtk_widget_get_sensitive(format_switch)){
-            gtk_switch_set_active(GTK_SWITCH(format_switch),1);
             if (device_label){
                 char *parameter = config(part_label_parameter);
                 if (!yon_char_is_empty(parameter)){
@@ -524,8 +521,8 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
                     gtk_spin_button_set_value(GTK_SPIN_BUTTON(partition_size_spin),atol(parameter));
                     gtk_combo_box_set_active(GTK_COMBO_BOX(partition_size_combo),yon_get_size_get_from_letter(parameter[strlen(parameter)-1])-1);
                 } else {
-                    gtk_spin_button_set_value(GTK_SPIN_BUTTON(partition_size_spin),16);
-                    gtk_combo_box_set_active(GTK_COMBO_BOX(partition_size_combo),1);
+                    gtk_spin_button_set_value(GTK_SPIN_BUTTON(partition_size_spin),3);
+                    gtk_combo_box_set_active(GTK_COMBO_BOX(partition_size_combo),2);
                 }
             }
             if (partition_mark_entry){
@@ -558,6 +555,9 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
                     gtk_entry_set_text(GTK_ENTRY(partition_encryption_entry),"");
                 }
             }
+        char *format = config(part_format_parameter);
+        if ((!yon_char_is_empty(format)&&!strcmp(format,"yes"))||!gtk_widget_get_sensitive(format_switch)){
+            gtk_switch_set_active(GTK_SWITCH(format_switch),1);
         } else if (gtk_widget_get_sensitive(format_switch)){
             gtk_switch_set_active(GTK_SWITCH(format_switch),0);
         }
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 84623aa..36d6105 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -239,7 +239,7 @@
   </object>
   <object class="GtkAdjustment" id="PartitionSize">
     <property name="upper">999999</property>
-    <property name="value">16</property>
+    <property name="value">10</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
@@ -12960,7 +12960,7 @@ separately into the selected partition.</property>
                                                             <property name="can-focus">True</property>
                                                             <property name="text" translatable="yes">16</property>
                                                             <property name="adjustment">PartitionSize</property>
-                                                            <property name="value">16</property>
+                                                            <property name="value">10</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>