diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 42b11af..4b3ebc2 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -27,7 +27,7 @@ configure_file(ubl-settings-diskquota.h.in ubl-settings-diskquota-cm.h)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection")
+        -fstack-clash-protection -fcf-protection -g")
 
 set(SOURCE_FILES
         view/view_edit_project.cc
diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade
index 48a7b58..e9b8191 100644
--- a/ubl-settings-diskquota.glade
+++ b/ubl-settings-diskquota.glade
@@ -252,7 +252,16 @@
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
-  <object class="GtkListStore" id="liststore1"/>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">dialog-question-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">ibus-panel</property>
+  </object>
   <object class="GtkMenu" id="menuAbout">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -262,34 +271,36 @@
       <object class="GtkCheckMenuItem" id="chbMangSystemFile">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="margin-left">7</property>
-        <property name="margin-start">7</property>
+        <property name="margin-left">4</property>
+        <property name="margin-start">4</property>
         <property name="label" translatable="yes">Direct control of the file system</property>
         <property name="use-underline">True</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="btnSynopsis">
+      <object class="GtkImageMenuItem" id="btnSynopsis">
+        <property name="label" translatable="yes">Help</property>
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Help</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
+        <property name="margin-left">5</property>
+        <property name="margin-start">5</property>
+        <property name="image">image2</property>
+        <property name="use-stock">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="btnAbout">
+      <object class="GtkImageMenuItem" id="btnAbout">
+        <property name="label" translatable="yes">About</property>
         <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>
+        <property name="margin-left">5</property>
+        <property name="margin-start">5</property>
+        <property name="image">image3</property>
+        <property name="use-stock">False</property>
       </object>
     </child>
   </object>
+  <object class="GtkListStore" id="liststore1"/>
   <object class="GtkMenu" id="menuLoad">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -589,9 +600,8 @@
                           <object class="GtkBox" id="boxGeneralUsersEnableCheck">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="spacing">5</property>
                             <child>
-                              <object class="GtkBox" id="box10">
+                              <object class="GtkBox" id="box17">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="orientation">vertical</property>
@@ -608,7 +618,6 @@
                                     <property name="margin-top">5</property>
                                     <property name="margin-bottom">5</property>
                                     <property name="label" translatable="yes">Excess size delay period</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -627,11 +636,11 @@
                                     <property name="margin-top">5</property>
                                     <property name="margin-bottom">5</property>
                                     <property name="label" translatable="yes">Excess files delay period</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
+                                    <property name="pack-type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -649,16 +658,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box11">
+                                  <object class="GtkBox" id="box9">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersSizWeeksSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeWeeksSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -677,6 +689,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">weeks</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -692,16 +705,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box12">
+                                  <object class="GtkBox" id="box10">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersFileWeeksSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesWeeksSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -720,6 +736,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">weeks</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -748,16 +765,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box13">
+                                  <object class="GtkBox" id="box11">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersSizeDaySpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeDaysSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -776,6 +796,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">days</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -791,16 +812,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box14">
+                                  <object class="GtkBox" id="box12">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersFilesDaySpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesDaysSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -819,6 +843,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">days</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -847,16 +872,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box15">
+                                  <object class="GtkBox" id="box13">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersSizeHourSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeHoursSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -875,6 +903,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">hours</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -890,16 +919,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box16">
+                                  <object class="GtkBox" id="box14">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersFilesHoursSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesHourSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -912,10 +944,13 @@
                                         <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-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">hours</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -944,16 +979,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box17">
+                                  <object class="GtkBox" id="box15">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersSizeMinuteSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeMinutesSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -972,6 +1010,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">minutes</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -987,16 +1026,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box18">
+                                  <object class="GtkBox" id="box16">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalUsersFilesMinutesSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesMinuteSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1015,6 +1057,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">minutes</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1250,14 +1293,10 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Users</property>
-                        <style>
-                          <class name="nobg"/>
-                          <class name="noborder"/>
-                          <class name="thin"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="position">1</property>
+                        <property name="tab-fill">False</property>
                       </packing>
                     </child>
                     <child>
@@ -1327,19 +1366,18 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="boxGeneralGroupsEnableCheck">
+                          <object class="GtkBox" id="boxGeneralUsersEnableCheck2">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="spacing">5</property>
                             <child>
-                              <object class="GtkBox" id="box1">
+                              <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <property name="homogeneous">True</property>
                                 <child>
-                                  <object class="GtkLabel" id="generalGroupsSizeLabel">
+                                  <object class="GtkLabel" id="generalProjectSizeLabel1">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                     <property name="margin-left">5</property>
@@ -1349,7 +1387,6 @@
                                     <property name="margin-top">5</property>
                                     <property name="margin-bottom">5</property>
                                     <property name="label" translatable="yes">Excess size delay period</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1368,11 +1405,11 @@
                                     <property name="margin-top">5</property>
                                     <property name="margin-bottom">5</property>
                                     <property name="label" translatable="yes">Excess files delay period</property>
-                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
+                                    <property name="pack-type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -1390,16 +1427,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box2">
+                                  <object class="GtkBox" id="box1">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsSizeWeeksSpi">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsSizeWeeksSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1418,6 +1458,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">weeks</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1433,16 +1474,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box3">
+                                  <object class="GtkBox" id="box2">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsFileWeeksSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsFilesWeeksSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1461,6 +1505,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">weeks</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1489,16 +1534,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box4">
+                                  <object class="GtkBox" id="box3">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsSizeDaySpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsSizeDaysSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1517,6 +1565,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">days</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1532,16 +1581,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box5">
+                                  <object class="GtkBox" id="box4">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsFilesDaySpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsFilesDaysSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1560,6 +1612,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">days</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1588,16 +1641,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box7">
+                                  <object class="GtkBox" id="box5">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsSizeHourSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsSizeHoursSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1616,6 +1672,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">hours</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1634,13 +1691,16 @@
                                   <object class="GtkBox" id="box6">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsFilesHourSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsFilesHoursSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1659,6 +1719,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">hours</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1687,16 +1748,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box9">
+                                  <object class="GtkBox" id="box7">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsSizeMinuteSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsSizeMinutesSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1715,6 +1779,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">minutes</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1733,13 +1798,16 @@
                                   <object class="GtkBox" id="box8">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalGroupsFilesMinuteSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalGroupsFilesMinutesSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1758,6 +1826,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">minutes</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1993,14 +2062,10 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Groups</property>
-                        <style>
-                          <class name="nobg"/>
-                          <class name="noborder"/>
-                          <class name="thin"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="position">2</property>
+                        <property name="tab-fill">False</property>
                       </packing>
                     </child>
                     <child>
@@ -2028,7 +2093,7 @@
                                 <property name="margin-end">5</property>
                                 <property name="margin-top">5</property>
                                 <property name="margin-bottom">5</property>
-                                <property name="label" translatable="yes">Device: </property>
+                                <property name="label" translatable="yes">Device:</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2070,29 +2135,80 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkBox" id="boxGeneralUsersEnableCheck1">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <child>
-                              <object class="GtkButton" id="btnFilterProject">
+                              <object class="GtkBox">
                                 <property name="visible">True</property>
-                                <property name="can-focus">True</property>
-                                <property name="receives-default">True</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-top">5</property>
-                                <property name="margin-bottom">5</property>
+                                <property name="can-focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">5</property>
+                                <property name="homogeneous">True</property>
                                 <child>
-                                  <object class="GtkBox">
+                                  <object class="GtkLabel" id="generalProjectSizeLabel">
+                                    <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-top">5</property>
+                                    <property name="margin-bottom">5</property>
+                                    <property name="label" translatable="yes">Excess size delay period</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="generalProjectFilesLabel">
+                                    <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-top">5</property>
+                                    <property name="margin-bottom">5</property>
+                                    <property name="label" translatable="yes">Excess files delay period</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="pack-type">end</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="boxProjectWeeks">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <object class="GtkBox" id="box18">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                     <child>
-                                      <object class="GtkImage">
+                                      <object class="GtkSpinButton" id="generalProjectSizWeeksSpin">
                                         <property name="visible">True</property>
-                                        <property name="can-focus">False</property>
-                                        <property name="icon-name">com.ublinux.ubl-settings-diskquota.funnel</property>
+                                        <property name="can-focus">True</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2101,12 +2217,17 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="lblFilterProject">
+                                      <object class="GtkLabel" id="generalGroupsSizeWeeksLabel1">
                                         <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="label" translatable="yes">Filters</property>
+                                        <property name="margin-end">5</property>
+                                        <property name="margin-top">5</property>
+                                        <property name="margin-bottom">5</property>
+                                        <property name="label" translatable="yes">weeks</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2115,245 +2236,26 @@
                                       </packing>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
                                 <child>
-                                  <object class="GtkButton" id="btnDelProject">
-                                    <property name="label">gtk-delete</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</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-top">5</property>
-                                    <property name="margin-bottom">5</property>
-                                    <property name="use-stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="btnEditProject">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</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-top">5</property>
-                                    <property name="margin-bottom">5</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="visible">True</property>
-                                        <property name="can-focus">False</property>
-                                        <child>
-                                          <object class="GtkImage">
-                                            <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="stock">gtk-edit</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="lblEditProject">
-                                            <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="label" translatable="yes">Edit</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="btnAddProject">
-                                    <property name="label">gtk-add</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</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-top">5</property>
-                                    <property name="margin-bottom">5</property>
-                                    <property name="use-stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack-type">end</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="pack-type">end</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="boxGeneralUsersEnableCheck1">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="spacing">5</property>
-                            <child>
-                              <object class="GtkBox" id="box19">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <property name="spacing">5</property>
-                                <property name="homogeneous">True</property>
-                                <child>
-                                  <object class="GtkLabel" id="generalProjectSizeLabel">
-                                    <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-top">5</property>
-                                    <property name="margin-bottom">5</property>
-                                    <property name="label" translatable="yes">Excess size delay period</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="generalProjectFilesLabel">
-                                    <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-top">5</property>
-                                    <property name="margin-bottom">5</property>
-                                    <property name="label" translatable="yes">Excess files delay period</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="boxProjectWeeks">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <property name="spacing">5</property>
-                                <child>
-                                  <object class="GtkBox" id="box20">
+                                  <object class="GtkBox" id="box19">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkSpinButton" id="generalProjectSizWeeksSpin">
+                                      <object class="GtkSpinButton" id="generalProjectFileWeeksSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeWeeksSpin</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <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-top">5</property>
                                         <property name="margin-bottom">5</property>
-                                        <property name="label" translatable="yes">weeks</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="box21">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
-                                    <child>
-                                      <object class="GtkSpinButton" id="generalProjectFileWeeksSpin">
-                                        <property name="visible">True</property>
-                                        <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesWeeksSpin</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2362,7 +2264,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel">
+                                      <object class="GtkLabel" id="generalGroupsFilesWeeksLabel1">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
                                         <property name="margin-left">5</property>
@@ -2372,6 +2274,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">weeks</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2400,16 +2303,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box22">
+                                  <object class="GtkBox" id="box20">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalProjectSizeDaySpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeDaysSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2428,6 +2334,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">days</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2443,16 +2350,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box23">
+                                  <object class="GtkBox" id="box21">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalProjectFilesDaySpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesDaysSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2471,6 +2381,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">days</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2499,16 +2410,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box24">
+                                  <object class="GtkBox" id="box22">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalProjectSizeHourSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeHoursSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2527,6 +2441,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">hours</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2542,16 +2457,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box25">
+                                  <object class="GtkBox" id="box23">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalProjectFilesHoursSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesHourSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2564,10 +2482,13 @@
                                         <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-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">hours</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2596,16 +2517,19 @@
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkBox" id="box26">
+                                  <object class="GtkBox" id="box24">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalProjectSizeMinuteSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersSizeMinutesSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2624,6 +2548,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">minutes</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2639,16 +2564,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="box27">
+                                  <object class="GtkBox" id="box25">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkSpinButton" id="generalProjectFilesMinutesSpin">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
-                                        <property name="text" translatable="yes">0</property>
-                                        <property name="adjustment">generalUsersFilesMinuteSpin</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-top">5</property>
+                                        <property name="margin-bottom">5</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2667,6 +2595,7 @@
                                         <property name="margin-top">5</property>
                                         <property name="margin-bottom">5</property>
                                         <property name="label" translatable="yes">minutes</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2721,6 +2650,174 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <child>
+                              <object class="GtkButton" id="btnFilterProject">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</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-top">5</property>
+                                <property name="margin-bottom">5</property>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">com.ublinux.ubl-settings-diskquota.funnel</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="lblFilterGroups1">
+                                        <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">Filters</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <child>
+                                  <object class="GtkButton" id="btnDelProject">
+                                    <property name="label">gtk-delete</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</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-top">5</property>
+                                    <property name="margin-bottom">5</property>
+                                    <property name="use-stock">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="btnEditProject">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</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-top">5</property>
+                                    <property name="margin-bottom">5</property>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <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="stock">gtk-edit</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="lblEditGroups1">
+                                            <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="label" translatable="yes">Edit</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="btnAddProject">
+                                    <property name="label">gtk-add</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</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-top">5</property>
+                                    <property name="margin-bottom">5</property>
+                                    <property name="use-stock">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="pack-type">end</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack-type">end</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
@@ -2734,14 +2831,10 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Project</property>
-                        <style>
-                          <class name="noborder"/>
-                          <class name="thin"/>
-                          <class name="nobg"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="position">3</property>
+                        <property name="tab-fill">False</property>
                       </packing>
                     </child>
                   </object>
@@ -2952,7 +3045,6 @@
   <object class="GtkSizeGroup" id="SpinButtonHeightSizeGroup">
     <property name="mode">vertical</property>
     <widgets>
-      <widget name="generalGroupsSizeLabel"/>
       <widget name="generalGroupsFilesLabel"/>
       <widget name="generalGroupsSizeWeeksSpi"/>
       <widget name="generalGroupsSizeWeeksLabel"/>
@@ -2989,8 +3081,6 @@
       <widget name="box14"/>
       <widget name="box15"/>
       <widget name="box16"/>
-      <widget name="box17"/>
-      <widget name="box18"/>
     </widgets>
   </object>
   <object class="GtkAdjustment" id="quotegroupFilesHardLimitAdjustment">