diff --git a/code/chat.js b/code/chat.js
index e969d9f2..04cf5147 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -563,7 +563,7 @@ window.chat.needMoreMessages = function() {
 
 window.chat.chooseTab = function(tab) {
   if (tab != 'all' && tab != 'faction' && tab != 'alerts') {
-    console.warn('chat tab "'+t+'" requested - but only "all", "faction" and "alerts" are valid - assuming "all" wanted');
+    console.warn('chat tab "'+tab+'" requested - but only "all", "faction" and "alerts" are valid - assuming "all" wanted');
     tab = 'all';
   }
 
diff --git a/code/panes.js b/code/panes.js
index c5ea4eea..60edf1f9 100644
--- a/code/panes.js
+++ b/code/panes.js
@@ -6,18 +6,15 @@ window.show = function(id) {
   runHooks("paneChanged", id);
 
   switch(id) {
-    case 'full':
-      window.chat.show('full');
-      break;
-    case 'compact':
-      window.chat.show('compact');
-      break;
-    case 'public':
-      window.chat.show('public');
+    case 'all':
+      window.chat.show('all');
       break;
     case 'faction':
       window.chat.show('faction');
       break;
+    case 'alerts':
+      window.chat.show('alerts');
+      break;
     case 'debug':
       window.debug.console.show();
       break;
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
index 826388f2..dbfc91ac 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
@@ -270,20 +270,18 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
             clear();
 
             add(Pane.INFO);
-            add(Pane.FULL);
-            add(Pane.COMPACT);
-            add(Pane.PUBLIC);
+            add(Pane.ALL);
             add(Pane.FACTION);
+            add(Pane.ALERTS);
         }
     }
 
     public static class Pane {
-        public static final Pane COMPACT = new Pane("compact", "Compact", R.drawable.ic_action_view_as_list_compact);
+        public static final Pane ALL = new Pane("all", "All", R.drawable.ic_action_view_as_list);
         public static final Pane FACTION = new Pane("faction", "Faction", R.drawable.ic_action_cc_bcc);
-        public static final Pane FULL = new Pane("full", "Full", R.drawable.ic_action_view_as_list);
+        public static final Pane ALERTS = new Pane("alerts", "Alerts", R.drawable.ic_action_warning);
         public static final Pane INFO = new Pane("info", "Info", R.drawable.ic_action_about);
         public static final Pane MAP = new Pane("map", "Map", R.drawable.ic_action_map);
-        public static final Pane PUBLIC = new Pane("public", "Public", R.drawable.ic_action_group);
 
         private final int icon;
         public String label;