diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 8a275a7..596bd45 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -1028,6 +1028,8 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
         case YON_PAGE_INSTALLATION:{
             yon_switch_page_render(widgets,3);
             gtk_widget_set_sensitive(widgets->BackButton,0);
+            if ((!main_config.configure_mode))
+                gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
             if (main_config.config_save_thread&&!main_config.configure_mode)
                 g_thread_join(main_config.config_save_thread);
             if (!main_config.progress_thread&&!main_config.configure_mode)
@@ -2155,8 +2157,8 @@ main_window *yon_main_window_complete(){
     widgets->GpartedSameButton = yon_gtk_builder_get_widget(builder,"GpartedSameButton");
 
     widgets->ConfigurationModeMenuItem = yon_gtk_builder_get_widget(builder,"ConfigurationModeMenuItem");
-    widgets->DocumentationMenuItem = yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
-    widgets->AboutMenuItem = yon_gtk_builder_get_widget(builder,"AboutMenuItem");
+    widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL);
+    widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL);
 
     widgets->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
     widgets->AdditionalSoftwareCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"AdditionalSoftwareCell"));
@@ -2226,6 +2228,12 @@ main_window *yon_main_window_complete(){
     widgets->SameFSTypeSensitiveCheck = yon_gtk_builder_get_widget(builder,"SameFSTypeSensitiveCheck");
     widgets->SameLabelSensitiveCheck = yon_gtk_builder_get_widget(builder,"SameLabelSensitiveCheck");
 
+    GtkWidget *menu = yon_gtk_builder_get_widget(builder,"menu2");
+    gtk_style_context_add_class(gtk_widget_get_style_context(widgets->DocumentationMenuItem),"menuitemmiddle");
+    gtk_style_context_remove_class(gtk_widget_get_style_context(widgets->DocumentationMenuItem),"menuitemtop");
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem);
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem);
+
     g_signal_connect(G_OBJECT(widgets->LoadGlobalConfigurationMenuItem),"activate",G_CALLBACK(on_config_global_load),widgets);
     g_signal_connect(G_OBJECT(widgets->LoadLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_local_load),widgets);
     g_signal_connect(G_OBJECT(widgets->LoadExternalConfigurationMenuItem),"activate",G_CALLBACK(on_config_custom_load),widgets);
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index fb1fc94..1d9f769 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -210,30 +210,11 @@
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Configuration mode</property>
         <property name="use-underline">True</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="DocumentationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Documentation</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitemtop"/>
         </style>
       </object>
     </child>
-    <child>
-      <object class="GtkMenuItem" id="AboutMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About</property>
-        <property name="use-underline">True</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
   </object>
   <object class="GtkMenu" id="menu3">
     <property name="visible">True</property>