diff --git a/ubl-settings-update-mirror-add.glade b/ubl-settings-update-mirror-add.glade
index 7497a63..49f86be 100644
--- a/ubl-settings-update-mirror-add.glade
+++ b/ubl-settings-update-mirror-add.glade
@@ -17,6 +17,8 @@
     <property name="width-request">500</property>
     <property name="can-focus">False</property>
     <property name="modal">True</property>
+    <property name="default-width">800</property>
+    <property name="default-height">600</property>
     <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
       <object class="GtkBox">
diff --git a/ubl-settings-update-mirror-configure.glade b/ubl-settings-update-mirror-configure.glade
index e7e4f93..d9af859 100644
--- a/ubl-settings-update-mirror-configure.glade
+++ b/ubl-settings-update-mirror-configure.glade
@@ -75,6 +75,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
@@ -128,6 +129,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
@@ -200,6 +202,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
@@ -253,6 +256,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
@@ -345,6 +349,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
@@ -397,6 +402,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
@@ -432,6 +438,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
@@ -485,6 +492,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
diff --git a/ubl-settings-update-repo-add.glade b/ubl-settings-update-repo-add.glade
index 01c3dd9..179149d 100644
--- a/ubl-settings-update-repo-add.glade
+++ b/ubl-settings-update-repo-add.glade
@@ -102,9 +102,9 @@
   </object>
   <object class="GtkApplicationWindow" id="MainWindow">
     <property name="width-request">800</property>
-    <property name="height-request">600</property>
     <property name="can-focus">False</property>
     <property name="modal">True</property>
+    <property name="default-height">600</property>
     <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
       <object class="GtkBox">
diff --git a/ubl-settings-update-web-publication-add.glade b/ubl-settings-update-web-publication-add.glade
index eca9436..5dc2c50 100644
--- a/ubl-settings-update-web-publication-add.glade
+++ b/ubl-settings-update-web-publication-add.glade
@@ -23,9 +23,10 @@
   </object>
   <object class="GtkApplicationWindow" id="MainWindow">
     <property name="width-request">800</property>
-    <property name="height-request">600</property>
     <property name="can-focus">False</property>
     <property name="modal">True</property>
+    <property name="default-width">800</property>
+    <property name="default-height">600</property>
     <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
       <object class="GtkBox">
@@ -233,6 +234,7 @@
               <object class="GtkFrame">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="label-xalign">0.019999999552965164</property>
                 <property name="shadow-type">in</property>
                 <child>
@@ -271,6 +273,7 @@
               <object class="GtkFrame">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-start">3</property>
                 <property name="label-xalign">0.019999999552965164</property>
                 <property name="shadow-type">in</property>
                 <child>