diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js
index a8335cb..9425611 100644
--- a/static/js/mainMenu.js
+++ b/static/js/mainMenu.js
@@ -5,7 +5,6 @@ oml.ui.mainMenu = function() {
     var ui = oml.user.ui,
         findState = oml.getFindState(ui.find),
         fromMenu = false,
-        appItems = Ox.getObjectById(oml.config.pages, 'app').parts,
 
         that = Ox.MainMenu({
             extras: [
@@ -19,15 +18,31 @@ oml.ui.mainMenu = function() {
                     id: 'appMenu',
                     title: '<img src="/static/png/oml.png" style="width: 14px; height: 14px">',
                     items: [
-                        appItems.slice(0, 1),
-                        {}
-                    ].concat(
-                        appItems.slice(1)
-                    ).concat([
+                        {
+                            id: 'about',
+                            title: Ox._('About Open Media Library')
+                        },
+                        {},
+                        {
+                            id: 'faq',
+                            title: Ox._('Frequently Asked Questions')
+                        },
+                        {
+                            id: 'terms',
+                            title: Ox._('Terms and Conditions')
+                        },
+                        {
+                            id: 'development',
+                            title: Ox._('Software Development')
+                        },
+                        {
+                            id: 'contact',
+                            title: Ox._('Send Feedback')
+                        },
                         {},
                         {
                             id: 'update',
-                            title: 'Software Update...'
+                            title: Ox._('Software Update...')
                         },
                         {},
                         {
@@ -35,7 +50,7 @@ oml.ui.mainMenu = function() {
                             title: Ox._('Quit Open Media Library'),
                             keyboard: 'control q'
                         }
-                    ])
+                    ]
                 },
                 {
                     id: 'userMenu',
@@ -48,12 +63,12 @@ oml.ui.mainMenu = function() {
                         },
                         {},
                         {
-                            id: 'users',
-                            title: Ox._('Users...')
+                            id: 'peers',
+                            title: Ox._('Peers...')
                         },
                         {
-                            id: 'devices',
-                            title: Ox._('Devices...')
+                            id: 'transfers',
+                            title: Ox._('Transfers...')
                         }
                     ]
                 },
@@ -164,19 +179,6 @@ oml.ui.mainMenu = function() {
                             title: Ox._((ui.showBrowser ? 'Hide': 'Show') + ' Browser'),
                             keyboard: 'shift b',
                             disabled: !ui.item
-                        },
-                        {},
-                        {
-                            id: 'notifications',
-                            title: Ox._('Notifications...')
-                        },
-                        {
-                            id: 'transfers',
-                            title: Ox._('Transfers...')
-                        },
-                        {
-                            id: 'activity',
-                            title: Ox._('Activity...')
                         }
                     ]
                 },
@@ -348,16 +350,17 @@ oml.ui.mainMenu = function() {
                 if (Ox.contains([
                     'about', 'faq', 'terms', 'development', 'contact'
                 ], id)) {
-                    oml.UI.set({'part.app': id});
-                    oml.UI.set({page: 'app'});
+                    oml.UI.set({page: id});
                 } else if (id == 'update') {
                     oml.$ui.updateDialog = oml.ui.updateDialog().open();
                 } else if (id == 'quit') {
                     oml.api.quit();
                 } else if (id == 'preferences') {
                     oml.UI.set({page: 'preferences'});
-                } else if (id == 'users') {
-                    oml.UI.set({page: 'users'});
+                } else if (id == 'peers') {
+                    oml.UI.set({page: 'peers'});
+                } else if (id == 'transfers') {
+                    oml.UI.set({page: 'transfers'});
                 } else if (id == 'alllibraries') {
                     if (!ui._list) {
                         oml.UI.set({item: ''});
@@ -460,8 +463,6 @@ oml.ui.mainMenu = function() {
                     oml.UI.set({showFilters: !ui.showFilters});
                 } else if (id == 'showbrowser') {
                     oml.UI.set({showBrowser: !ui.showBrowser});
-                } else if (id == 'transfers') {
-                    oml.UI.set({page: 'transfers'});
                 } else if (id == 'debugmode') {
                     if (oml.localStorage('enableDebugMode')) {
                         oml.localStorage['delete']('enableDebugMode');