From: Matthew Fischer <matthew.fischer@canonical.com>
Description: Fix several UI layout issues and incorrect tool-tips.
 This change fixes numerous UI layout issues, including invalid tool-tips, 
 lack of space to display information, and UI elements that resized when 
 they should not.

Bug: https://bugzilla.gnome.org/654117
Bug-Ubuntu: https://launchpad.net/bugs/891852
Bug-Ubuntu: https://launchpad.net/bugs/806606
Bug-Ubuntu: https://launchpad.net/bugs/841007

---
Index: gnome-nettool-bzr/data/gnome-nettool.ui
===================================================================
--- gnome-nettool-bzr.orig/data/gnome-nettool.ui	2011-11-26 21:45:54.356474588 -0700
+++ gnome-nettool-bzr/data/gnome-nettool.ui	2011-11-26 21:45:53.396474617 -0700
@@ -1,182 +1,30 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk+" version="2.16"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">99</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_size">0</property>
+    <property name="upper">99</property>
     <property name="value">5</property>
-  </object>
-  <object class="GtkListStore" id="model1">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Host</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model2">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Host</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model3">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Host</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model4">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Host</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model5">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Host</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model6">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">User</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model7">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Host</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkUIManager" id="uimanager1">
-    <child>
-      <object class="GtkActionGroup" id="actiongroup1">
-        <child>
-          <object class="GtkAction" id="tool1">
-            <property name="name">tool1</property>
-            <property name="label" translatable="yes">_Tool</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="m_beep">
-            <property name="name">m_beep</property>
-            <property name="label" translatable="yes">Beep on ping</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="m_quit">
-            <property name="stock_id">gtk-quit</property>
-            <property name="name">m_quit</property>
-            <signal handler="gn_quit_app" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit1">
-            <property name="name">edit1</property>
-            <property name="label" translatable="yes">_Edit</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="m_copy">
-            <property name="name">m_copy</property>
-            <property name="label" translatable="yes">Copy as text _report</property>
-            <signal handler="on_copy_activate" name="activate" object="notebook"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="m_clear_history">
-            <property name="stock_id">gtk-clear</property>
-            <property name="name">m_clear_history</property>
-            <property name="label" translatable="yes">Clear _History</property>
-            <signal handler="on_clear_history_activate" name="activate" object="notebook"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="help1">
-            <property name="name">help1</property>
-            <property name="label" translatable="yes">_Help</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="m_help_contents">
-            <property name="stock_id">gtk-help</property>
-            <property name="name">m_help_contents</property>
-            <signal handler="on_help_activate" name="activate" object="main_window"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="m_about">
-            <property name="stock_id">gtk-about</property>
-            <property name="name">m_about</property>
-            <signal after="yes" handler="on_about_activate" name="activate" object="main_window"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <menubar name="menubar1">
-        <menu action="tool1">
-          <menuitem action="m_beep"/>
-          <separator/>
-          <menuitem action="m_quit"/>
-        </menu>
-        <menu action="edit1">
-          <menuitem action="m_copy"/>
-          <separator/>
-          <menuitem action="m_clear_history"/>
-        </menu>
-        <menu action="help1">
-          <menuitem action="m_help_contents"/>
-          <placeholder name="LaunchpadItems"/>
-          <menuitem action="m_about"/>
-        </menu>
-      </menubar>
-    </ui>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkWindow" id="main_window">
     <property name="visible">True</property>
-    <property comments="Dear Translator: This is the Window Title" name="title" translatable="yes">Devices - Network Tools</property>
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes" comments="Dear Translator: This is the Window Title">Devices - Network Tools</property>
     <child>
       <object class="GtkVBox" id="vbox_main">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <child>
-          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+          <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -184,26 +32,30 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">4</property>
-            <signal handler="on_page_switch" name="switch_page"/>
+            <signal name="switch-page" handler="on_page_switch" swapped="no"/>
             <child>
               <object class="GtkVBox" id="vbox_info">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkHBox" id="hbox33">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="info_combo_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Network device:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -213,10 +65,12 @@
                         <property name="can_default">True</property>
                         <property name="has_default">True</property>
                         <accessibility>
-                          <relation target="info_combo_label" type="labelled-by"/>
+                          <relation type="labelled-by" target="info_combo_label"/>
                         </accessibility>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -224,28 +78,35 @@
                       <object class="GtkButton" id="info_configure_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
                         <child>
                           <object class="GtkAlignment" id="alignment33">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xscale">0</property>
                             <property name="yscale">0</property>
                             <child>
                               <object class="GtkHBox" id="hbox44">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkImage" id="image13">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="stock">gtk-preferences</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label122">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">_Configure</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -269,32 +130,38 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="info_ipv6_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment17">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow8">
+                            <property name="height_request">120</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="border_width">6</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                            <property name="shadow_type">in</property>
                             <child>
                               <object class="GtkTreeView" id="info_list_ip_addr">
-                                <property name="height_request">120</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="vexpand">True</property>
                                 <property name="rules_hint">True</property>
                                 <property name="enable_search">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -304,35 +171,42 @@
                     <child type="label">
                       <object class="GtkLabel" id="label96">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;IP Information&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="hbox_info_detail">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">4</property>
                     <child>
                       <object class="GtkVBox" id="vbox16">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkFrame" id="frame11">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment32">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkTable" id="table13">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="border_width">6</property>
                                     <property name="n_rows">5</property>
                                     <property name="n_columns">2</property>
@@ -341,107 +215,114 @@
                                     <child>
                                       <object class="GtkLabel" id="label_hw_address">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Hardware address:</property>
                                         <accessibility>
-                                          <relation target="info_hw_address" type="label-for"/>
+                                          <relation type="label-for" target="info_hw_address"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_multicast">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Multicast:</property>
                                         <accessibility>
-                                          <relation target="info_multicast" type="label-for"/>
+                                          <relation type="label-for" target="info_multicast"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_mtu">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">MTU:</property>
                                         <accessibility>
-                                          <relation target="info_mtu" type="label-for"/>
+                                          <relation type="label-for" target="info_mtu"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_link_speed">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Link speed:</property>
                                         <accessibility>
-                                          <relation target="info_link_speed" type="label-for"/>
+                                          <relation type="label-for" target="info_link_speed"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_state">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">State:</property>
                                         <accessibility>
-                                          <relation target="info_state" type="label-for"/>
+                                          <relation type="label-for" target="info_state"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_hw_address">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
-                                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                        <property name="justify">right</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_hw_address" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_hw_address"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_multicast">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_multicast" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_multicast"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -450,17 +331,18 @@
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_mtu">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_mtu" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_mtu"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -469,17 +351,18 @@
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_link_speed">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_link_speed" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_link_speed"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -488,17 +371,18 @@
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_state">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_state" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_state"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -507,7 +391,7 @@
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                   </object>
@@ -517,32 +401,44 @@
                             <child type="label">
                               <object class="GtkLabel" id="label121">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Interface Information&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">True</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="GtkVBox" id="vbox17">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkFrame" id="frame4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
-                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment16">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkTable" id="table_statitics">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="border_width">6</property>
                                     <property name="n_rows">7</property>
                                     <property name="n_columns">2</property>
@@ -551,41 +447,44 @@
                                     <child>
                                       <object class="GtkLabel" id="label_tx_bytes">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Transmitted bytes:</property>
                                         <accessibility>
-                                          <relation target="info_tx_bytes" type="label-for"/>
+                                          <relation type="label-for" target="info_tx_bytes"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_rx_bytes">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Received bytes:</property>
                                         <accessibility>
-                                          <relation target="info_rx_bytes" type="label-for"/>
+                                          <relation type="label-for" target="info_rx_bytes"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_rx_bytes">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_rx_bytes" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_rx_bytes"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -594,34 +493,36 @@
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_tx_bytes">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_tx_bytes" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_tx_bytes"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_tx_errors">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_tx_errors" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_tx_errors"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -630,33 +531,35 @@
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_tx_errors">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Transmission errors:</property>
                                         <accessibility>
-                                          <relation target="info_tx_errors" type="label-for"/>
+                                          <relation type="label-for" target="info_tx_errors"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_tx">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_tx" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_tx"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -665,33 +568,35 @@
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_tx">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Transmitted packets:</property>
                                         <accessibility>
-                                          <relation target="info_rx" type="label-for"/>
+                                          <relation type="label-for" target="info_rx"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_rx">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_rx" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_rx"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -700,33 +605,35 @@
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_rx">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Received packets:</property>
                                         <accessibility>
-                                          <relation target="info_rx" type="label-for"/>
+                                          <relation type="label-for" target="info_rx"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_rx_errors">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_rx_errors" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_rx_errors"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -735,33 +642,35 @@
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_rx_errors">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Reception errors:</property>
                                         <accessibility>
-                                          <relation target="info_rx_errors" type="label-for"/>
+                                          <relation type="label-for" target="info_rx_errors"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="info_collisions">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Not Available</property>
                                         <property name="selectable">True</property>
                                         <accessibility>
-                                          <relation target="label_collisions" type="labelled-by"/>
+                                          <relation type="labelled-by" target="label_collisions"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -770,24 +679,25 @@
                                         <property name="top_attach">6</property>
                                         <property name="bottom_attach">7</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label_collisions">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Collisions:</property>
-                                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                        <property name="justify">right</property>
                                         <accessibility>
-                                          <relation target="info_collisions" type="label-for"/>
+                                          <relation type="label-for" target="info_collisions"/>
                                         </accessibility>
                                       </object>
                                       <packing>
                                         <property name="top_attach">6</property>
                                         <property name="bottom_attach">7</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                   </object>
@@ -797,6 +707,7 @@
                             <child type="label">
                               <object class="GtkLabel" id="label95">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Interface Statistics&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
@@ -804,11 +715,14 @@
                           </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">1</property>
                       </packing>
                     </child>
@@ -834,16 +748,19 @@
             <child>
               <object class="GtkVBox" id="vbox_ping">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkVBox" id="vbox18">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkTable" id="table6">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
@@ -851,22 +768,27 @@
                         <child>
                           <object class="GtkHBox" id="hbox25">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkHBox" id="hbox9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkRadioButton" id="ping_limited">
+                                    <property name="label" translatable="yes">Only</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Only</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -876,7 +798,7 @@
                                     <property name="adjustment">adjustment1</property>
                                     <property name="climb_rate">1</property>
                                     <accessibility>
-                                      <relation target="ping_count_label" type="labelled-by"/>
+                                      <relation type="labelled-by" target="ping_count_label"/>
                                     </accessibility>
                                   </object>
                                   <packing>
@@ -888,6 +810,7 @@
                                 <child>
                                   <object class="GtkLabel" id="ping_count_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">requests</property>
                                   </object>
                                   <packing>
@@ -899,13 +822,17 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="ping_unlimited">
+                                <property name="label" translatable="yes">Unlimited requests</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Unlimited requests</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">ping_limited</property>
@@ -929,6 +856,7 @@
                         <child>
                           <object class="GtkLabel" id="label109">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Send:</property>
                           </object>
@@ -936,41 +864,39 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="ping_host">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="model">model1</property>
                             <property name="has_entry">True</property>
                             <accessibility>
-                              <relation target="ping_host_label" type="labelled-by"/>
+                              <relation type="labelled-by" target="ping_host_label"/>
                             </accessibility>
-                            <child internal-child="entry">
-                              <object class="GtkEntry" id="comboboxentry-entry1">
-                                <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Enter the network address to ping. For example: www.domain.com or 192.168.2.1</property>
-                                <accessibility>
-
-                                </accessibility>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="a11y-comboboxentry-entry11">
-                                    <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
-                                  </object>
-                                </child>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="ping_host-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Network address</property>
                               </object>
                             </child>
-                            <property name="model">model1</property>
                             <child>
                               <object class="GtkCellRendererText" id="renderer1"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>
                             </child>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="a11y-ping_host1">
-                                <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+                            <child internal-child="entry">
+                              <object class="GtkEntry" id="comboboxentry-entry1">
+                                <property name="can_focus">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip_text" translatable="yes">Enter the network address to ping. For example: www.domain.com or 192.168.2.1</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="comboboxentry-entry1-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Network address</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -983,54 +909,64 @@
                         <child>
                           <object class="GtkLabel" id="ping_host_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">_Network address:</property>
                             <property name="use_underline">True</property>
                             <accessibility>
-                              <relation target="ping_host" type="label-for"/>
+                              <relation type="label-for" target="ping_host"/>
                             </accessibility>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHButtonBox" id="hbuttonbox2">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
                         <child>
                           <object class="GtkButton" id="ping_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <child>
                               <object class="GtkAlignment" id="alignment5">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox12">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image5">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-ok</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label27">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Ping</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -1045,33 +981,84 @@
                               </object>
                             </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">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="GtkExpander" id="expander1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="border_width">6</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTreeView" id="ping_output">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">6</property>
+                            <property name="enable_search">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection2"/>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label123">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Details</property>
+                      </object>
+                    </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="GtkHBox" id="hbox35">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkFrame" id="frame8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment20">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkTable" id="table1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="border_width">6</property>
                                 <property name="n_rows">3</property>
                                 <property name="n_columns">3</property>
@@ -1080,11 +1067,12 @@
                                 <child>
                                   <object class="GtkLabel" id="ping_maximum">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">0.0</property>
                                     <property name="selectable">True</property>
                                     <accessibility>
-                                      <relation target="label_maximum" type="labelled-by"/>
+                                      <relation type="labelled-by" target="label_maximum"/>
                                     </accessibility>
                                   </object>
                                   <packing>
@@ -1093,17 +1081,18 @@
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="ping_average">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">0.0</property>
                                     <property name="selectable">True</property>
                                     <accessibility>
-                                      <relation target="label_average" type="labelled-by"/>
+                                      <relation type="labelled-by" target="label_average"/>
                                     </accessibility>
                                   </object>
                                   <packing>
@@ -1112,31 +1101,33 @@
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="ping_minimum">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">0.0</property>
                                     <property name="selectable">True</property>
                                     <accessibility>
-                                      <relation target="label_minimum" type="labelled-by"/>
+                                      <relation type="labelled-by" target="label_minimum"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label39">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property comments="Translators: this is the abbreviation for milliseconds" name="label" translatable="yes">ms</property>
+                                    <property name="label" translatable="yes" comments="Translators: this is the abbreviation for milliseconds">ms</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -1144,12 +1135,13 @@
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label38">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">ms</property>
                                   </object>
@@ -1159,12 +1151,13 @@
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label37">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">ms</property>
                                   </object>
@@ -1172,53 +1165,56 @@
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label_maximum">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Maximum:</property>
                                     <accessibility>
-                                      <relation target="ping_maximum" type="label-for"/>
+                                      <relation type="label-for" target="ping_maximum"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label_average">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Average:</property>
                                     <accessibility>
-                                      <relation target="ping_average" type="label-for"/>
+                                      <relation type="label-for" target="ping_average"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label_minimum">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Minimum:</property>
                                     <accessibility>
-                                      <relation target="ping_minimum" type="label-for"/>
+                                      <relation type="label-for" target="ping_minimum"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                               </object>
@@ -1228,6 +1224,7 @@
                         <child type="label">
                           <object class="GtkLabel" id="label99">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Round Trip Time Statistics&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -1235,20 +1232,25 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment21">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkTable" id="table2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="border_width">6</property>
                                 <property name="n_rows">3</property>
                                 <property name="n_columns">2</property>
@@ -1257,25 +1259,27 @@
                                 <child>
                                   <object class="GtkLabel" id="label_packets_transmitted">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Packets transmitted:</property>
                                     <accessibility>
-                                      <relation target="ping_packets_transmitted" type="label-for"/>
+                                      <relation type="label-for" target="ping_packets_transmitted"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="ping_packets_success">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">0%</property>
                                     <property name="selectable">True</property>
                                     <accessibility>
-                                      <relation target="label_packets_success" type="labelled-by"/>
+                                      <relation type="labelled-by" target="label_packets_success"/>
                                     </accessibility>
                                   </object>
                                   <packing>
@@ -1284,17 +1288,18 @@
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="ping_packets_received">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">0</property>
                                     <property name="selectable">True</property>
                                     <accessibility>
-                                      <relation target="label_packets_received" type="labelled-by"/>
+                                      <relation type="labelled-by" target="label_packets_received"/>
                                     </accessibility>
                                   </object>
                                   <packing>
@@ -1303,56 +1308,59 @@
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="ping_packets_transmitted">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">0</property>
                                     <property name="selectable">True</property>
                                     <accessibility>
-                                      <relation target="label_packets_transmitted" type="labelled-by"/>
+                                      <relation type="labelled-by" target="label_packets_transmitted"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label_packets_success">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Successful packets:</property>
                                     <accessibility>
-                                      <relation target="ping_packets_success" type="label-for"/>
+                                      <relation type="label-for" target="ping_packets_success"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label_packets_received">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Packets received:</property>
                                     <accessibility>
-                                      <relation target="ping_packets_received" type="label-for"/>
+                                      <relation type="label-for" target="ping_packets_received"/>
                                     </accessibility>
                                   </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
+                                    <property name="y_options"></property>
                                   </packing>
                                 </child>
                               </object>
@@ -1362,6 +1370,7 @@
                         <child type="label">
                           <object class="GtkLabel" id="label100">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Transmission Statistics&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -1369,6 +1378,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1381,52 +1391,25 @@
                 </child>
                 <child>
                   <object class="GtkDrawingArea" id="ping_graph">
+                    <property name="height_request">160</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkExpander" id="expander1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="border_width">6</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                        <child>
-                          <object class="GtkTreeView" id="ping_output">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="border_width">6</property>
-                            <property name="enable_search">False</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label123">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Details</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="pack_type">GTK_PACK_END</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="ping">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Ping</property>
               </object>
               <packing>
@@ -1437,37 +1420,45 @@
             <child>
               <object class="GtkVBox" id="vbox_netstat">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkVBox" id="vbox19">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkHBox" id="hbox43">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label110">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="yalign">0</property>
                             <property name="label" translatable="yes">Display:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox7">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="netstat_routing">
+                                <property name="label" translatable="yes">Routing Table Information</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Routing Table Information</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -1475,13 +1466,16 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="netstat_protocol">
+                                <property name="label" translatable="yes">Active Network Services</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Active Network Services</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">netstat_routing</property>
@@ -1494,9 +1488,11 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="netstat_multicast">
+                                <property name="label" translatable="yes">Multicast Information</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Multicast Information</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">netstat_routing</property>
@@ -1509,45 +1505,58 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</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="padding">4</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHButtonBox" id="hbuttonbox4">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
                         <child>
                           <object class="GtkButton" id="netstat_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <child>
                               <object class="GtkAlignment" id="alignment8">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox16">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image7">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-ok</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label31">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Netstat</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -1562,15 +1571,24 @@
                               </object>
                             </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">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1578,35 +1596,39 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">6</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="netstat_output">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Output for net stat</property>
+                        <property name="tooltip_text" translatable="yes">Output for net stat</property>
                         <property name="enable_search">False</property>
-                        <accessibility>
-
-                        </accessibility>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-netstat_output1">
-                            <property name="AtkObject::accessible_name" translatable="yes">Netstat output</property>
+                          <object class="AtkObject" id="netstat_output-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Netstat output</property>
                           </object>
                         </child>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection3"/>
+                        </child>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="netstat">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Netstat</property>
               </object>
               <packing>
@@ -1617,88 +1639,108 @@
             <child>
               <object class="GtkVBox" id="vbox_traceroute">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkVBox" id="vbox20">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
-                    <property name="expand">False</property>
                     <child>
                       <object class="GtkHBox" id="hbox36">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="traceroute_host_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">_Network address:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="traceroute_host">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="model">model2</property>
                             <property name="has_entry">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer2"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry2">
+                                <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1</property>
+                                <property name="tooltip_text" translatable="yes">Enter the network address to trace a route. For example: www.domain.com or 192.168.2.1</property>
                                 <accessibility>
-                                  <relation target="traceroute_host_label" type="labelled-by"/>
+                                  <relation type="labelled-by" target="traceroute_host_label"/>
                                 </accessibility>
                               </object>
                             </child>
-                            <property name="model">model2</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer2"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
                           </object>
                           <packing>
+                            <property name="expand">True</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="GtkHButtonBox" id="hbuttonbox3">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
                         <child>
                           <object class="GtkButton" id="traceroute_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <child>
                               <object class="GtkAlignment" id="alignment7">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox15">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image6">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-ok</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label30">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Trace</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -1713,15 +1755,24 @@
                               </object>
                             </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">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1729,37 +1780,41 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">6</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="traceroute_output">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Output for traceroute</property>
+                        <property name="tooltip_text" translatable="yes">Output for traceroute</property>
+                        <property name="vexpand">True</property>
                         <property name="enable_search">False</property>
-                        <accessibility>
-
-                        </accessibility>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-traceroute_output1">
-                            <property name="AtkObject::accessible_name" translatable="yes">Traceroute output</property>
+                          <object class="AtkObject" id="traceroute_output-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Traceroute output</property>
                           </object>
                         </child>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection4"/>
+                        </child>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="traceroute">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Enter the network address to trace a route to. For example: www.domain.com or 192.168.2.1</property>
                 <property name="label" translatable="yes">Traceroute</property>
               </object>
               <packing>
@@ -1770,93 +1825,110 @@
             <child>
               <object class="GtkVBox" id="vbox_scan">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkVBox" id="vbox21">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
-                    <property name="expand">False</property>
                     <child>
                       <object class="GtkHBox" id="hbox37">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="scan_host_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">_Network address:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="scan_host">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="model">model3</property>
                             <property name="has_entry">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer3"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry3">
+                                <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
                                 <property name="tooltip_text" translatable="yes">Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1</property>
-                                <accessibility>
-
-                                </accessibility>
                                 <child internal-child="accessible">
-                                  <object class="AtkObject" id="a11y-comboboxentry-entry31">
-                                    <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+                                  <object class="AtkObject" id="comboboxentry-entry3-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Network address</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
-                            <property name="model">model3</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer3"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
                           </object>
                           <packing>
+                            <property name="expand">True</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="GtkHButtonBox" id="hbuttonbox5">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
                         <child>
                           <object class="GtkButton" id="scan_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <child>
                               <object class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox18">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image8">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-ok</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label47">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Scan</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -1871,15 +1943,24 @@
                               </object>
                             </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">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1887,35 +1968,40 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">6</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="scan_output">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Output for port scan</property>
+                        <property name="tooltip_text" translatable="yes">Output for port scan</property>
+                        <property name="vexpand">True</property>
                         <property name="enable_search">False</property>
-                        <accessibility>
-
-                        </accessibility>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-scan_output1">
-                            <property name="AtkObject::accessible_name" translatable="yes">Port scan output</property>
+                          <object class="AtkObject" id="scan_output-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Port scan output</property>
                           </object>
                         </child>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection5"/>
+                        </child>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">4</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="scan">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Port Scan</property>
               </object>
               <packing>
@@ -1926,16 +2012,19 @@
             <child>
               <object class="GtkVBox" id="vbox_lookup">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkVBox" id="vbox23">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkTable" id="table7">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
@@ -1957,6 +2046,7 @@
                         <child>
                           <object class="GtkLabel" id="lookup_type_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Information type:</property>
                             <property name="use_underline">True</property>
@@ -1965,35 +2055,33 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="lookup_host">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="model">model4</property>
                             <property name="has_entry">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer4"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry4">
+                                <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Enter the network address to lookup. For example: www.domain.com or 192.168.2.1</property>
-                                <accessibility>
-
-                                </accessibility>
+                                <property name="tooltip_text" translatable="yes">Enter the domain to lookup. For example: domain.com or ftp.domain.com.</property>
                                 <child internal-child="accessible">
-                                  <object class="AtkObject" id="a11y-comboboxentry-entry41">
-                                    <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+                                  <object class="AtkObject" id="comboboxentry-entry4-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Network address</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
-                            <property name="model">model4</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer4"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -2004,52 +2092,62 @@
                         <child>
                           <object class="GtkLabel" id="lookup_host_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Network address:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHButtonBox" id="hbuttonbox6">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
                         <child>
                           <object class="GtkButton" id="lookup_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <child>
                               <object class="GtkAlignment" id="alignment10">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox27">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image9">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-ok</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label68">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Lookup</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -2064,15 +2162,24 @@
                               </object>
                             </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">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -2080,34 +2187,39 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">6</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="lookup_output">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Output for lookup</property>
-                        <accessibility>
-
-                        </accessibility>
+                        <property name="tooltip_text" translatable="yes">Output for lookup</property>
+                        <property name="vexpand">True</property>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-lookup_output1">
-                            <property name="AtkObject::accessible_name" translatable="yes">Lookup output</property>
+                          <object class="AtkObject" id="lookup_output-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Lookup output</property>
                           </object>
                         </child>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection6"/>
+                        </child>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">5</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="lookup">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Lookup</property>
               </object>
               <packing>
@@ -2118,16 +2230,19 @@
             <child>
               <object class="GtkVBox" id="vbox_finger">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkVBox" id="vbox24">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkTable" id="table8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
@@ -2136,28 +2251,26 @@
                           <object class="GtkComboBox" id="finger_host">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="model">model5</property>
                             <property name="has_entry">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer5"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry6">
+                                <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
                                 <property name="tooltip_text" translatable="yes">Enter the network address to finger that user. For example: www.domain.com or 192.168.2.1</property>
-                                <accessibility>
-
-                                </accessibility>
                                 <child internal-child="accessible">
-                                  <object class="AtkObject" id="a11y-comboboxentry-entry61">
-                                    <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+                                  <object class="AtkObject" id="comboboxentry-entry6-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Network address</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
-                            <property name="model">model5</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer5"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -2172,28 +2285,26 @@
                           <object class="GtkComboBox" id="finger_user">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="model">model6</property>
                             <property name="has_entry">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer6"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry5">
+                                <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
                                 <property name="tooltip_text" translatable="yes">Enter the user to finger</property>
-                                <accessibility>
-
-                                </accessibility>
                                 <child internal-child="accessible">
-                                  <object class="AtkObject" id="a11y-comboboxentry-entry51">
-                                    <property name="AtkObject::accessible_name" translatable="yes">User name</property>
+                                  <object class="AtkObject" id="comboboxentry-entry5-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">User name</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
-                            <property name="model">model6</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer6"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -2204,6 +2315,7 @@
                         <child>
                           <object class="GtkLabel" id="finger_host_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Network address:</property>
                             <property name="use_underline">True</property>
@@ -2212,58 +2324,68 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="finger_user_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Username:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHButtonBox" id="hbuttonbox7">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
                         <child>
                           <object class="GtkButton" id="finger_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <child>
                               <object class="GtkAlignment" id="alignment11">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox30">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image10">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-ok</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label78">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Finger</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -2278,15 +2400,24 @@
                               </object>
                             </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">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -2294,35 +2425,36 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">6</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTextView" id="finger_output">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Output for finger</property>
+                        <property name="tooltip_text" translatable="yes">Output for finger</property>
                         <property name="editable">False</property>
-                        <accessibility>
-
-                        </accessibility>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-finger_output1">
-                            <property name="AtkObject::accessible_name" translatable="yes">Finger output</property>
+                          <object class="AtkObject" id="finger_output-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Finger output</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">6</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="finger">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Finger</property>
               </object>
               <packing>
@@ -2333,93 +2465,110 @@
             <child>
               <object class="GtkVBox" id="vbox_whois">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkVBox" id="vbox22">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
                     <property name="spacing">12</property>
-                    <property name="expand">False</property>
                     <child>
                       <object class="GtkHBox" id="hbox38">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="whois_host_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">_Domain address:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="whois_host">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="model">model7</property>
                             <property name="has_entry">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer7"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry7">
+                                <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
                                 <property name="tooltip_text" translatable="yes">Enter a domain address to lookup its whois information. For example: www.domain.com or 192.168.2.1</property>
-                                <accessibility>
-
-                                </accessibility>
                                 <child internal-child="accessible">
-                                  <object class="AtkObject" id="a11y-comboboxentry-entry71">
-                                    <property name="AtkObject::accessible_name" translatable="yes">Domain address</property>
+                                  <object class="AtkObject" id="comboboxentry-entry7-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Domain address</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
-                            <property name="model">model7</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer7"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
                           </object>
                           <packing>
+                            <property name="expand">True</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="GtkHButtonBox" id="hbuttonbox8">
                         <property name="visible">True</property>
-                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
                         <child>
                           <object class="GtkButton" id="whois_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <child>
                               <object class="GtkAlignment" id="alignment12">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox32">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image11">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-ok</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label85">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Whois</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -2434,15 +2583,24 @@
                               </object>
                             </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">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -2450,45 +2608,42 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">6</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTextView" id="whois_output">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Output for whois</property>
+                        <property name="tooltip_text" translatable="yes">Output for whois</property>
                         <property name="editable">False</property>
-                        <accessibility>
-
-
-                        </accessibility>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="a11y-whois_output1">
-                            <property name="AtkObject::accessible_description" translatable="yes">Whois output</property>
-                            <property name="AtkObject::accessible_name" translatable="yes">Whois output</property>
+                          <object class="AtkObject" id="whois_output-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Whois output</property>
+                            <property name="AtkObject::accessible-description" translatable="yes">Whois output</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">7</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="whois">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes">Output for whois</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Output for whois</property>
                 <property name="label" translatable="yes">Whois</property>
-                <accessibility>
-
-                </accessibility>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="a11y-whois1">
-                    <property name="AtkObject::accessible_name" translatable="yes">Whois output</property>
+                  <object class="AtkObject" id="whois-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Whois output</property>
                   </object>
                 </child>
               </object>
@@ -2499,27 +2654,35 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkHBox" id="hbox42">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkProgressBar" id="progress_bar">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="pulse_step">0.10000000149</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkStatusbar" id="statusbar">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -2533,4 +2696,81 @@
       </object>
     </child>
   </object>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Host</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Host</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model3">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Host</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model4">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Host</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model5">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Host</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model6">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">User</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model7">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Host</col>
+      </row>
+    </data>
+  </object>
 </interface>
