diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 6e3dec2..bf2cbf8 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -375,12 +375,12 @@ gboolean yon_installation_progress_update(void *data){
                                 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),0);
                                 gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),"");
                             } else {
-                                gtk_widget_show(widgets->PackageInstallationProgress);
-                                gtk_widget_show(widgets->PackageInstallationLabel);
+                                gtk_widget_show(gtk_widget_get_parent(widgets->PackageInstallationProgress));
+                                
                                 int size;
                                 config_str parsed = yon_char_parse(current_copy,&size," ");
-                                double fraction = atof(parsed[3])/100;
-                                gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),fraction/100);
+                                double fraction = atof(parsed[2])/100;
+                                gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),fraction);
                                 gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),yon_char_parsed_to_string(parsed,size," "));
                                 yon_char_parsed_free(parsed,size);
                             }
@@ -449,8 +449,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
             break;
         case YON_PAGE_COMPLETION:{
             gtk_widget_set_sensitive(widgets->BackButton,0);
-            gtk_widget_hide(widgets->InstallationProgress);
-            gtk_widget_hide(widgets->PackageInstallationProgress);
+            gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress));
             gtk_widget_hide(widgets->InstallationLabel);
             gtk_widget_hide(widgets->PackageInstallationLabel);
             gtk_widget_set_sensitive(widgets->NextButton,1);
@@ -460,7 +459,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
             gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL);
             gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL);
             gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))),"com.ublinux.libublsettingsui-gtk3.sync-symbolic",GTK_ICON_SIZE_BUTTON);
-            gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.libublsettingsui-gtk3.reset-symbolic",GTK_ICON_SIZE_BUTTON);
+            // gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.libublsettingsui-gtk3.reset-symbolic",GTK_ICON_SIZE_BUTTON);
             
                 // pthread_t tid;
                 // pthread_create(&tid,NULL,on_config_save,widgets);
@@ -820,9 +819,11 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                         yon_debug_output("Install state: %s\n",yon_char_from_int(main_config.install_complete));
                     if (main_config.install_complete)
                         gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
-                    gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
-                    gtk_widget_set_sensitive(widgets->NextButton,0);
-                    gtk_widget_set_sensitive(widgets->BackButton,0);
+                    else {
+                        gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
+                        gtk_widget_set_sensitive(widgets->NextButton,0);
+                        gtk_widget_set_sensitive(widgets->BackButton,0);
+                    }
                 }break;
                 case YON_PAGE_INSTALLATION_BEGIN:{
                     pthread_t tid;
@@ -856,6 +857,9 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
         } break;
         case -2: { // Cancel/repeat
             switch (page){
+                case YON_PAGE_COMPLETION:{
+                    gtk_main_quit();
+                    }break;
                 default:{
                     gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),0);
                 }
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 217046e..399d6ee 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -434,6 +434,7 @@ agreement</property>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-end">5</property>
                 <property name="margin-bottom">5</property>
                 <property name="orientation">vertical</property>
                 <child>