diff --git a/ubl-settings-resourcequota.glade b/ubl-settings-resourcequota.glade
index d2d73bd..afc71e0 100644
--- a/ubl-settings-resourcequota.glade
+++ b/ubl-settings-resourcequota.glade
@@ -60,7 +60,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">ubl-settings-resourcequota</property>
+            <property name="label" translatable="yes">CPU and RAM quotas</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -1172,7 +1172,7 @@
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="stock">gtk-stop</property>
+                        <property name="icon-name">process-stop-symbolic</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1225,7 +1225,7 @@
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="stock">gtk-save</property>
+                        <property name="icon-name">emblem-ok-symbolic</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2255,7 +2255,7 @@
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="stock">gtk-stop</property>
+                        <property name="icon-name">process-stop-symbolic</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2308,7 +2308,7 @@
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="stock">gtk-save</property>
+                        <property name="icon-name">emblem-ok-symbolic</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2605,7 +2605,7 @@ translated and supported by community.</property>
           <object class="GtkLabel" id="webHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">UBLinux Settings</property>
+            <property name="label" translatable="yes">CPU and RAM quotas</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -2700,7 +2700,9 @@ translated and supported by community.</property>
     <property name="height-request">600</property>
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="border-width">0</property>
     <property name="icon-name">com.ublinux.ubl-settings-resourcequota</property>
+    <property name="startup-id">CPU and RAM quotas</property>
     <child>
       <object class="GtkBox" id="plugBox">
         <property name="visible">True</property>
@@ -2806,7 +2808,6 @@ translated and supported by community.</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="hexpand">True</property>
                 <property name="vexpand">True</property>
@@ -2815,12 +2816,6 @@ translated and supported by community.</property>
                   <object class="GtkBox" id="boxFuncs">
                     <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="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="orientation">vertical</property>
@@ -2837,11 +2832,11 @@ translated and supported by community.</property>
                               <object class="GtkScrolledWindow">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
-                                <property name="shadow-type">in</property>
                                 <child>
                                   <object class="GtkViewport">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
+                                    <property name="shadow-type">none</property>
                                     <child>
                                       <object class="GtkTreeView" id="treeViewMain">
                                         <property name="visible">True</property>
@@ -3033,7 +3028,7 @@ limit
                                           <object class="GtkImage">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="icon-name">com.ublinux.ubl-settings-resourcequota.funnel</property>
+                                            <property name="icon-name">com.ublinux.ubl-settings-resourcequota.funnel-symbolic</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -3088,7 +3083,7 @@ limit
                                           <object class="GtkImage">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="icon-name">tab-new-symbolic</property>
+                                            <property name="icon-name">value-increase-symbolic</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -3141,7 +3136,7 @@ limit
                                           <object class="GtkImage">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="icon-name">error-correct-symbolic</property>
+                                            <property name="icon-name">document-edit-symbolic</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -3194,7 +3189,7 @@ limit
                                           <object class="GtkImage">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="icon-name">software-remove-symbolic</property>
+                                            <property name="icon-name">user-trash-symbolic</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -3309,16 +3304,15 @@ limit
                               <object class="GtkBox" id="boxDispatcher">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</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="spacing">5</property>
                                 <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">Update every</property>
                                   </object>
                                   <packing>
@@ -3331,12 +3325,6 @@ limit
                                   <object class="GtkSpinButton" id="spinUpdateDispatcher">
                                     <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="width-chars">6</property>
                                     <property name="text" translatable="yes">1</property>
                                     <property name="adjustment">adjustDisp</property>
@@ -3351,12 +3339,6 @@ limit
                                   <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">seconds</property>
                                   </object>
                                   <packing>
@@ -3370,12 +3352,6 @@ limit
                                     <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>
@@ -3429,6 +3405,9 @@ limit
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-bottom">5</property>
                                 <child>
                                   <object class="VteTerminal" id="vteDispatcher">
                                     <property name="visible">True</property>
@@ -3492,18 +3471,17 @@ limit
                               <object class="GtkBox" id="boxProcesses">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</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="spacing">5</property>
                                 <child>
                                   <object class="GtkCheckButton" id="btnMainShowAllEmpty">
                                     <property name="label" translatable="yes">All groups including empty</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">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="draw-indicator">True</property>
                                   </object>
                                   <packing>
@@ -3518,12 +3496,6 @@ limit
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">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="draw-indicator">True</property>
                                   </object>
                                   <packing>
@@ -3543,6 +3515,9 @@ limit
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-bottom">5</property>
                                 <child>
                                   <object class="VteTerminal" id="vteProcesses">
                                     <property name="visible">True</property>
@@ -3607,16 +3582,15 @@ limit
                               <object class="GtkBox" id="boxInformation">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</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="spacing">5</property>
                                 <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">View properties for</property>
                                   </object>
                                   <packing>
@@ -3629,12 +3603,6 @@ limit
                                   <object class="GtkComboBoxText" id="cbtMainInfo">
                                     <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="active">0</property>
                                     <property name="active-id">0</property>
                                     <items>
@@ -3653,12 +3621,6 @@ limit
                                   <object class="GtkComboBoxText" id="cbtMainInfoLevel2">
                                     <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>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -3677,6 +3639,9 @@ limit
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-bottom">5</property>
                                 <child>
                                   <object class="VteTerminal" id="vteInformation">
                                     <property name="visible">True</property>
@@ -3781,7 +3746,7 @@ limit
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">ubl-settings-resourcequota</property>
+            <property name="label" translatable="yes">CPU and RAM quotas</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -4043,7 +4008,7 @@ limit
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="stock">gtk-stop</property>
+                        <property name="icon-name">process-stop-symbolic</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4090,7 +4055,7 @@ limit
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="stock">gtk-save</property>
+                        <property name="icon-name">emblem-ok-symbolic</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>