diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade
index 6435023..7e349b7 100644
--- a/ubl-settings-diskquota.glade
+++ b/ubl-settings-diskquota.glade
@@ -371,8 +371,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   </object>
   <object class="GtkWindow" id="SetDeviceWindow">
     <property name="can-focus">False</property>
-    <property name="default-width">250</property>
-    <property name="default-height">400</property>
+    <property name="resizable">False</property>
+    <property name="destroy-with-parent">True</property>
     <property name="icon-name">com.ublinux.ubl-settings-diskquota</property>
     <child>
       <object class="GtkBox">
@@ -517,17 +517,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     <property name="margin-end">5</property>
                     <property name="margin-top">5</property>
                     <property name="margin-bottom">5</property>
-                    <property name="label-xalign">0</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="label-yalign">0.5899999737739563</property>
                     <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkAlignment">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="left-padding">12</property>
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
+                            <property name="margin-left">5</property>
+                            <property name="margin-right">5</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="margin-bottom">5</property>
                             <child>
                               <object class="GtkBox" id="box30">
                                 <property name="visible">True</property>
@@ -736,8 +741,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-start">5</property>
                         <property name="label" translatable="yes">The postponement period for exceeding the volume:</property>
                       </object>
                     </child>
@@ -758,17 +761,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     <property name="margin-end">5</property>
                     <property name="margin-top">5</property>
                     <property name="margin-bottom">5</property>
-                    <property name="label-xalign">0</property>
+                    <property name="label-xalign">0.019999999552965164</property>
                     <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkAlignment">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="left-padding">12</property>
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
+                            <property name="margin-left">5</property>
+                            <property name="margin-right">5</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="margin-bottom">5</property>
                             <child>
                               <object class="GtkBox" id="box26">
                                 <property name="visible">True</property>
@@ -977,8 +984,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-start">5</property>
                         <property name="label" translatable="yes">The delay period for exceeding files:</property>
                       </object>
                     </child>
@@ -1107,6 +1112,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <property name="can-focus">False</property>
     <property name="valign">start</property>
     <property name="resizable">False</property>
+    <property name="destroy-with-parent">True</property>
     <property name="icon-name">com.ublinux.ubl-settings-diskquota</property>
     <child>
       <object class="GtkBox">
@@ -2179,6 +2185,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="default-width">450</property>
+    <property name="destroy-with-parent">True</property>
     <property name="icon-name">dialog-question-symbolic</property>
     <child>
       <object class="GtkBox">