diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index f0b2c58..af86c32 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -127,7 +127,23 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
             gtk_widget_set_sensitive(widgets->NextButton,1);
             gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
         break;
+        
     }
+    switch(page){
+            case YON_PAGE_KERNEL:
+            case YON_PAGE_KERNEL_ADDON:
+            case YON_PAGE_PACMAN_SOFTWARE:
+            case YON_PAGE_REGION:
+            case YON_PAGE_KEYBOARD:
+            case YON_PAGE_USERS:
+            case YON_PAGE_STARTUP:
+            case YON_PAGE_BOOTLOADER:
+            case YON_PAGE_NETWORK:
+                gtk_widget_show(widgets->SkipInstallationButton);
+            break;
+            default: 
+                gtk_widget_hide(widgets->SkipInstallationButton);
+        }
 }
 
 int yon_page_save(main_window *widgets, enum YON_PAGES page){
@@ -412,6 +428,10 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
 }
 
 void on_system_setup_pass(GtkWidget *, main_window *widgets){
-    gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
+    if (main_config.configure_mode){
+        gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END);
+    } else {
+        gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
+    }
     yon_page_update(widgets);
 }
\ No newline at end of file
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index dab1c53..ce6fbd2 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -214,6 +214,7 @@ source_window *yon_source_window_new(){
     g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_source_add),window);
     g_signal_connect(G_OBJECT(window->PathButton),"clicked",G_CALLBACK(on_source_choose),window);
     g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->AddBox);
+    g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->TypeCombo);
     g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->AddButton);
     g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->PathButton);
     g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->PathEntry);
diff --git a/ubinstall-gtk-source.glade b/ubinstall-gtk-source.glade
index e1848e1..6f95c26 100644
--- a/ubinstall-gtk-source.glade
+++ b/ubinstall-gtk-source.glade
@@ -92,6 +92,7 @@
                       <object class="GtkSwitch" id="AutoSwitch">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="active">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -141,6 +142,7 @@
                                 <child>
                                   <object class="GtkComboBoxText" id="TypeCombo">
                                     <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
                                     <property name="can-focus">False</property>
                                     <property name="active">0</property>
                                     <items>
@@ -158,6 +160,7 @@
                                 <child>
                                   <object class="GtkEntry" id="PathEntry">
                                     <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
                                     <property name="can-focus">True</property>
                                   </object>
                                   <packing>
@@ -169,6 +172,7 @@
                                 <child>
                                   <object class="GtkButton" id="PathButton">
                                     <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">True</property>
                                     <property name="image">image1</property>
@@ -185,6 +189,7 @@
                                 <child>
                                   <object class="GtkButton" id="AddButton">
                                     <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">True</property>
                                     <property name="image">image2</property>
@@ -208,6 +213,7 @@
                             <child>
                               <object class="GtkBox" id="AddBox">
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can-focus">False</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 3d9feb4..cc601d0 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -371,6 +371,14 @@
         </style>
       </object>
     </child>
+    <child>
+      <object class="GtkCheckMenuItem" id="EnableVNCMenuItem">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Enable VNC server</property>
+        <property name="use-underline">True</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="menu3">
     <property name="visible">True</property>
@@ -10532,7 +10540,6 @@ separately into the selected partition.</property>
                     <child>
                       <object class="GtkButton" id="StartScenarioButton">
                         <property name="label" translatable="yes">Start installation scenario</property>
-                        <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                       </object>
@@ -10545,7 +10552,6 @@ separately into the selected partition.</property>
                     <child>
                       <object class="GtkButton" id="SourceButton">
                         <property name="label" translatable="yes">Source</property>
-                        <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                       </object>
@@ -10558,7 +10564,6 @@ separately into the selected partition.</property>
                     <child>
                       <object class="GtkButton" id="SkipInstallationButton">
                         <property name="label" translatable="yes">Skip installation</property>
-                        <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                       </object>