diff --git a/src/ui/glade/wifih.ui b/src/ui/glade/wifih.ui
index 4af0e3e..5173bcc 100644
--- a/src/ui/glade/wifih.ui
+++ b/src/ui/glade/wifih.ui
@@ -220,6 +220,60 @@
                             <property name="margin_bottom">5</property>
                             <property name="row_spacing">10</property>
                             <property name="column_homogeneous">True</property>
+                            <child>
+                              <object class="GtkRadioButton" id="rb_freq_2">
+                                <property name="label" translatable="yes">2.4Ghz</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">rb_freq_auto</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="rb_freq_auto">
+                                <property name="label" translatable="yes">Auto</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">rb_freq_5</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="label" translatable="yes">Frequency band</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="rb_freq_5">
+                                <property name="label" translatable="yes">5Ghz</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">rb_freq_auto</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">3</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkCheckButton" id="cb_hidden">
                                 <property name="label" translatable="yes">Hidden</property>
@@ -233,19 +287,6 @@
                                 <property name="top_attach">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="cb_no_haveged">
-                                <property name="label">No Haveged</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">9</property>
-                              </packing>
-                            </child>
                             <child>
                               <object class="GtkCheckButton" id="cb_psk">
                                 <property name="label" translatable="yes">Use psk</property>
@@ -322,57 +363,27 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkRadioButton" id="rb_freq_2">
-                                <property name="label" translatable="yes">2.4Ghz</property>
+                              <object class="GtkCheckButton" id="cb_gateway1">
+                                <property name="label" translatable="yes">Gateway</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">rb_freq_auto</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="rb_freq_auto">
-                                <property name="label" translatable="yes">Auto</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">rb_freq_5</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Frequency band</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <property name="top_attach">6</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkRadioButton" id="rb_freq_5">
-                                <property name="label" translatable="yes">5Ghz</property>
+                              <object class="GtkEntry" id="entry_gateway">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">rb_freq_auto</property>
+                                <property name="halign">start</property>
                               </object>
                               <packing>
-                                <property name="left_attach">3</property>
-                                <property name="top_attach">0</property>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">6</property>
                               </packing>
                             </child>
                             <child>
@@ -385,7 +396,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">6</property>
+                                <property name="top_attach">7</property>
                               </packing>
                             </child>
                             <child>
@@ -398,7 +409,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="top_attach">6</property>
+                                <property name="top_attach">7</property>
                                 <property name="height">2</property>
                               </packing>
                             </child>
@@ -412,7 +423,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">8</property>
+                                <property name="top_attach">9</property>
                               </packing>
                             </child>
                             <child>
@@ -425,9 +436,28 @@
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
-                                <property name="top_attach">8</property>
+                                <property name="top_attach">9</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="cb_no_haveged">
+                                <property name="label">No Haveged</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">10</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                             <child>
                               <placeholder/>
                             </child>