diff --git a/default.glade b/default.glade
index e8d7d99..e2d16a5 100644
--- a/default.glade
+++ b/default.glade
@@ -45,6 +45,21 @@
 	      <child>
 		<widget class="GtkMenu" id="menuitem7_menu">
 
+		  <child>
+		    <widget class="GtkImageMenuItem" id="refresh">
+		      <property name="visible">True</property>
+		      <property name="label">gtk-refresh</property>
+		      <property name="use_stock">True</property>
+		      <signal name="activate" handler="update_window_callback" last_modification_time="Thu, 20 May 2010 04:27:15 GMT"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separator1">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkImageMenuItem" id="quit1">
 		      <property name="visible">True</property>
@@ -63,10 +78,11 @@
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Views</property>
 	      <property name="use_underline">True</property>
-             <child>
-               <widget class="GtkMenu" id="view_menu">
-               </widget>
-             </child>
+
+              <child>
+                <widget class="GtkMenu" id="view_menu">
+                </widget>
+              </child>
 
 	    </widget>
 	  </child>
@@ -76,11 +92,11 @@
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Accounts</property>
 	      <property name="use_underline">True</property>
-             <child>
-               <widget class="GtkMenu" id="accounts_menu">
-               </widget>
-             </child>
 
+              <child>
+                <widget class="GtkMenu" id="accounts_menu">
+                </widget>
+              </child>
 
 	    </widget>
 	  </child>
@@ -102,6 +118,12 @@
 		      <signal name="activate" handler="on_about" last_modification_time="Thu, 08 Apr 2010 19:41:47 GMT"/>
 		    </widget>
 		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separator2">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
 		</widget>
 	      </child>
 	    </widget>
@@ -222,96 +244,6 @@
 	</packing>
       </child>
 
-      <child>
-	<widget class="GtkHBox" id="button_box">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="refresh_button">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Refresh</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="update_window_callback" last_modification_time="Thu, 06 May 2010 15:25:15 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="following_button">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_HALF</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_following_button_clicked" last_modification_time="Wed, 14 Apr 2010 16:55:44 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="at_button">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">@</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_at_button_clicked" last_modification_time="Fri, 16 Apr 2010 02:54:24 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="verified_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Verified Account</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">2</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">1</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
       <child>
 	<widget class="GtkHBox" id="update_box">
 	  <property name="visible">True</property>