diff --git a/data/glade/gc_occupants_menu.glade b/data/glade/gc_occupants_menu.glade
index 43e9d0a57..15a90c35b 100644
--- a/data/glade/gc_occupants_menu.glade
+++ b/data/glade/gc_occupants_menu.glade
@@ -1,163 +1,132 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
-
-<widget class="GtkMenu" id="gc_occupants_menu">
-
-  <child>
-    <widget class="GtkMenuItem" id="group_chat_actions_menuitem">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Occupant Actions</property>
-      <property name="use_underline">True</property>
-
-      <child>
-	<widget class="GtkMenu" id="group_chat_actions_menuitem_menu">
-
-	  <child>
-	    <widget class="GtkCheckMenuItem" id="voice_checkmenuitem">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Voice</property>
-	      <property name="use_underline">True</property>
-	      <property name="active">False</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckMenuItem" id="moderator_checkmenuitem">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Mo_derator</property>
-	      <property name="use_underline">True</property>
-	      <property name="active">False</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkSeparatorMenuItem" id="separator5">
-	      <property name="visible">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckMenuItem" id="member_checkmenuitem">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Member</property>
-	      <property name="use_underline">True</property>
-	      <property name="active">False</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckMenuItem" id="admin_checkmenuitem">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Admin</property>
-	      <property name="use_underline">True</property>
-	      <property name="active">False</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckMenuItem" id="owner_checkmenuitem">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Owner</property>
-	      <property name="use_underline">True</property>
-	      <property name="active">False</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkSeparatorMenuItem" id="separator4">
-	      <property name="visible">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="kick_menuitem">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Kick</property>
-	      <property name="use_underline">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="ban_menuitem">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Ban</property>
-	      <property name="use_underline">True</property>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="information_menuitem">
-      <property name="visible">True</property>
-      <property name="label">gtk-info</property>
-      <property name="use_stock">True</property>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="history_menuitem">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_History</property>
-      <property name="use_underline">True</property>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image1047">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-justify-fill</property>
-	  <property name="icon_size">1</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Add to Roster</property>
-      <property name="use_underline">True</property>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image1048">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-add</property>
-	  <property name="icon_size">1</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="send_private_message_menuitem">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Send Private Message</property>
-      <property name="use_underline">True</property>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image1049">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-jump-to</property>
-	  <property name="icon_size">1</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-</widget>
-
+  <widget class="GtkMenu" id="gc_occupants_menu">
+    <child>
+      <widget class="GtkImageMenuItem" id="send_private_message_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Send Private Message</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image1051">
+            <property name="visible">True</property>
+            <property name="stock">gtk-jump-to</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Add to Roster</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image1052">
+            <property name="visible">True</property>
+            <property name="stock">gtk-add</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkMenuItem" id="group_chat_actions_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Occupant Actions</property>
+        <property name="use_underline">True</property>
+        <child>
+          <widget class="GtkMenu" id="group_chat_actions_menuitem_menu">
+            <child>
+              <widget class="GtkCheckMenuItem" id="voice_checkmenuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Voice</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkCheckMenuItem" id="moderator_checkmenuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Mo_derator</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkSeparatorMenuItem" id="separator5">
+                <property name="visible">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkCheckMenuItem" id="member_checkmenuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Member</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkCheckMenuItem" id="admin_checkmenuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Admin</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkCheckMenuItem" id="owner_checkmenuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Owner</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkSeparatorMenuItem" id="separator4">
+                <property name="visible">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="kick_menuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Kick</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="ban_menuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Ban</property>
+                <property name="use_underline">True</property>
+              </widget>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="separator6">
+        <property name="visible">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="information_menuitem">
+        <property name="visible">True</property>
+        <property name="label">gtk-info</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="history_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_History</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image1053">
+            <property name="visible">True</property>
+            <property name="stock">gtk-justify-fill</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>