diff --git a/ghost/admin/app/routes/settings/tags.js b/ghost/admin/app/routes/settings/tags.js
index ce51180903..e19be9aa28 100644
--- a/ghost/admin/app/routes/settings/tags.js
+++ b/ghost/admin/app/routes/settings/tags.js
@@ -40,6 +40,7 @@ TagsRoute = AuthenticatedRoute.extend(CurrentUserSettings, PaginationRouteMixin,
 
     renderTemplate: function (controller, model) {
         this._super(controller, model);
+        this.render('settings/tags', {into: 'application'});
         this.render('settings/tags/settings-menu', {
             into: 'application',
             outlet: 'settings-menu',
diff --git a/ghost/admin/app/styles/layouts/main.scss b/ghost/admin/app/styles/layouts/main.scss
index 820343a34a..62365b53ed 100644
--- a/ghost/admin/app/styles/layouts/main.scss
+++ b/ghost/admin/app/styles/layouts/main.scss
@@ -16,6 +16,7 @@
 }
 
 .gh-main {
+    position: relative;
     flex-grow: 1;
     display: flex;
 }
@@ -168,7 +169,6 @@
 }
 
 //--------------------------------------------------------------
-#ember720 { flex-grow: 1; display: flex; } // TODO: REMOVE
 
 .gh-view {
     flex-grow: 1;
diff --git a/ghost/admin/app/views/application.js b/ghost/admin/app/views/application.js
index fb3127c218..1fa5a3d72e 100644
--- a/ghost/admin/app/views/application.js
+++ b/ghost/admin/app/views/application.js
@@ -27,19 +27,6 @@ var ApplicationView = Ember.View.extend({
             });
         });
 
-        // #### Listen to the viewport and change user-menu dropdown triangle classes accordingly
-        this.set('swapUserMenuDropdownTriangleClasses', Ember.run.bind(this, swapUserMenuDropdownTriangleClasses));
-
-        mobileQuery.addListener(this.get('swapUserMenuDropdownTriangleClasses'));
-        swapUserMenuDropdownTriangleClasses(mobileQuery);
-
-        this.set('closeGlobalMobileNavOnDesktop', Ember.run.bind(this, function closeGlobalMobileNavOnDesktop(mq) {
-            if (!mq.matches) {
-                // Is desktop sized
-                this.set('controller.showGlobalMobileNav', false);
-            }
-        }));
-
         mobileQuery.addListener(this.get('closeGlobalMobileNavOnDesktop'));
     },