diff --git a/src/gui/ipservicedialog_q.ui b/src/gui/ipservicedialog_q.ui
index ec0933541..41d36a09f 100644
--- a/src/gui/ipservicedialog_q.ui
+++ b/src/gui/ipservicedialog_q.ui
@@ -224,25 +224,7 @@
               <string>DiffServ</string>
              </property>
              <layout class="QGridLayout" >
-              <property name="leftMargin" >
-               <number>2</number>
-              </property>
-              <property name="topMargin" >
-               <number>2</number>
-              </property>
-              <property name="rightMargin" >
-               <number>2</number>
-              </property>
-              <property name="bottomMargin" >
-               <number>2</number>
-              </property>
-              <property name="horizontalSpacing" >
-               <number>2</number>
-              </property>
-              <property name="verticalSpacing" >
-               <number>2</number>
-              </property>
-              <item row="0" column="0" colspan="2" >
+              <item row="0" column="0" >
                <widget class="QRadioButton" name="use_dscp" >
                 <property name="text" >
                  <string>Use DSCP</string>
@@ -252,21 +234,21 @@
                 </property>
                </widget>
               </item>
-              <item row="1" column="0" colspan="2" >
+              <item row="0" column="1" >
                <widget class="QRadioButton" name="use_tos" >
                 <property name="text" >
                  <string>Use TOS</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0" >
+              <item row="1" column="0" >
                <widget class="QLabel" name="code_label" >
                 <property name="text" >
                  <string>DSCP code:</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="1" >
+              <item row="1" column="1" >
                <widget class="QLineEdit" name="code" />
               </item>
              </layout>
diff --git a/src/gui/ipv4dialog_q.ui b/src/gui/ipv4dialog_q.ui
index ae57519f7..51c6c66d6 100644
--- a/src/gui/ipv4dialog_q.ui
+++ b/src/gui/ipv4dialog_q.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>557</width>
-    <height>245</height>
+    <width>559</width>
+    <height>234</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -214,24 +214,16 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="leftMargin" >
-            <number>8</number>
-           </property>
-           <property name="topMargin" >
-            <number>8</number>
-           </property>
-           <property name="rightMargin" >
-            <number>8</number>
-           </property>
-           <property name="bottomMargin" >
-            <number>8</number>
-           </property>
-           <property name="horizontalSpacing" >
-            <number>2</number>
-           </property>
-           <property name="verticalSpacing" >
-            <number>8</number>
-           </property>
+           <item row="0" column="0" >
+            <widget class="QLabel" name="textLabel1" >
+             <property name="text" >
+              <string>Name:</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
            <item row="0" column="1" >
             <widget class="QLineEdit" name="obj_name" >
              <property name="sizePolicy" >
@@ -248,17 +240,17 @@
              </property>
             </widget>
            </item>
-           <item row="0" column="0" >
-            <widget class="QLabel" name="textLabel1" >
+           <item row="1" column="0" >
+            <widget class="QLabel" name="textLabel2_2" >
              <property name="text" >
-              <string>Name:</string>
+              <string>Address:</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
+           <item row="1" column="1" >
             <widget class="QLineEdit" name="address" >
              <property name="sizePolicy" >
               <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -269,26 +261,6 @@
             </widget>
            </item>
            <item row="2" column="0" >
-            <widget class="QLabel" name="textLabel2_2" >
-             <property name="text" >
-              <string>Address:</string>
-             </property>
-             <property name="wordWrap" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="1" >
-            <widget class="QLineEdit" name="netmask" >
-             <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="0" >
             <widget class="QLabel" name="netmaskLabel" >
              <property name="text" >
               <string>Netmask:</string>
@@ -298,7 +270,17 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="0" colspan="2" >
+           <item row="2" column="1" >
+            <widget class="QLineEdit" name="netmask" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" colspan="2" >
             <layout class="QHBoxLayout" >
              <property name="spacing" >
               <number>2</number>
diff --git a/src/gui/ipv6dialog_q.ui b/src/gui/ipv6dialog_q.ui
index 83808372a..9077770b5 100644
--- a/src/gui/ipv6dialog_q.ui
+++ b/src/gui/ipv6dialog_q.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>693</width>
-    <height>237</height>
+    <width>691</width>
+    <height>222</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -207,24 +207,6 @@
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="leftMargin" >
-            <number>8</number>
-           </property>
-           <property name="topMargin" >
-            <number>8</number>
-           </property>
-           <property name="rightMargin" >
-            <number>8</number>
-           </property>
-           <property name="bottomMargin" >
-            <number>8</number>
-           </property>
-           <property name="horizontalSpacing" >
-            <number>2</number>
-           </property>
-           <property name="verticalSpacing" >
-            <number>8</number>
-           </property>
            <item row="0" column="0" >
             <widget class="QLabel" name="textLabel1" >
              <property name="text" >
@@ -246,12 +228,12 @@
              <property name="minimumSize" >
               <size>
                <width>200</width>
-               <height>0</height>
+               <height>25</height>
               </size>
              </property>
             </widget>
            </item>
-           <item row="2" column="0" >
+           <item row="1" column="0" >
             <widget class="QLabel" name="textLabel2_2" >
              <property name="text" >
               <string>Address:</string>
@@ -261,7 +243,7 @@
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
+           <item row="1" column="1" >
             <widget class="QLineEdit" name="address" >
              <property name="sizePolicy" >
               <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -269,12 +251,18 @@
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize" >
+              <size>
+               <width>0</width>
+               <height>25</height>
+              </size>
+             </property>
              <property name="text" >
               <string/>
              </property>
             </widget>
            </item>
-           <item row="3" column="0" colspan="2" >
+           <item row="2" column="0" colspan="2" >
             <widget class="QFrame" name="frame" >
              <property name="frameShape" >
               <enum>QFrame::NoFrame</enum>
@@ -319,12 +307,18 @@
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
+                <property name="minimumSize" >
+                 <size>
+                  <width>0</width>
+                  <height>25</height>
+                 </size>
+                </property>
                </widget>
               </item>
              </layout>
             </widget>
            </item>
-           <item row="4" column="0" colspan="2" >
+           <item row="3" column="0" colspan="2" >
             <spacer>
              <property name="orientation" >
               <enum>Qt::Vertical</enum>
diff --git a/src/gui/physaddressdialog_q.ui b/src/gui/physaddressdialog_q.ui
index 2a52fd556..a8b3ac4a5 100644
--- a/src/gui/physaddressdialog_q.ui
+++ b/src/gui/physaddressdialog_q.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>532</width>
-    <height>277</height>
+    <width>563</width>
+    <height>207</height>
    </rect>
   </property>
   <property name="windowTitle" >
diff --git a/src/gui/projectpanel_q.ui b/src/gui/projectpanel_q.ui
index c4a4c49cf..1b393efbf 100644
--- a/src/gui/projectpanel_q.ui
+++ b/src/gui/projectpanel_q.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>627</width>
-    <height>456</height>
+    <width>802</width>
+    <height>542</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -305,7 +305,7 @@
           <item row="3" column="0" >
            <widget class="QFrame" name="auxiliaryPanel" >
             <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+             <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -350,11 +350,17 @@
           <item row="2" column="0" >
            <widget class="QFrame" name="objectEditorFrame" >
             <property name="sizePolicy" >
-             <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="maximumSize" >
+             <size>
+              <width>16777215</width>
+              <height>250</height>
+             </size>
+            </property>
             <property name="frameShape" >
              <enum>QFrame::NoFrame</enum>
             </property>
@@ -383,7 +389,7 @@
              <item row="0" column="0" >
               <widget class="QStackedWidget" name="objectEditorStack" >
                <property name="sizePolicy" >
-                <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+                <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
diff --git a/src/gui/tcpservicedialog_q.ui b/src/gui/tcpservicedialog_q.ui
index f56370275..b91ce753f 100644
--- a/src/gui/tcpservicedialog_q.ui
+++ b/src/gui/tcpservicedialog_q.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>739</width>
-    <height>392</height>
+    <width>981</width>
+    <height>262</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -738,22 +738,6 @@
                </layout>
               </item>
               <item row="1" column="0" >
-               <spacer>
-                <property name="orientation" >
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeType" >
-                 <enum>QSizePolicy::Fixed</enum>
-                </property>
-                <property name="sizeHint" >
-                 <size>
-                  <width>235</width>
-                  <height>16</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item row="2" column="0" >
                <widget class="QCheckBox" name="established" >
                 <property name="sizePolicy" >
                  <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -761,34 +745,16 @@
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
+                <property name="toolTip" >
+                 <string>Option "established" can be used if supported
+by the target firewall platform</string>
+                </property>
                 <property name="text" >
                  <string>Established</string>
                 </property>
                </widget>
               </item>
               <item row="3" column="0" >
-               <widget class="QLabel" name="textLabel1_4" >
-                <property name="sizePolicy" >
-                 <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text" >
-                 <string>Option "established" can be used if supported by the target firewall platform</string>
-                </property>
-                <property name="alignment" >
-                 <set>Qt::AlignVCenter</set>
-                </property>
-                <property name="wordWrap" >
-                 <bool>true</bool>
-                </property>
-                <property name="buddy" >
-                 <cstring>established</cstring>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0" >
                <spacer>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
diff --git a/src/gui/timedialog_q.ui b/src/gui/timedialog_q.ui
index 829475c8a..15015ca49 100644
--- a/src/gui/timedialog_q.ui
+++ b/src/gui/timedialog_q.ui
@@ -407,7 +407,19 @@
              <property name="title" >
               <string/>
              </property>
+             <property name="flat" >
+              <bool>false</bool>
+             </property>
              <layout class="QGridLayout" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="verticalSpacing" >
+               <number>0</number>
+              </property>
               <item row="0" column="0" >
                <widget class="QFrame" name="frame_2" >
                 <property name="frameShape" >