diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/templates/tags.hbs
index c355c1f3bd5..471f92ae13c 100644
--- a/app/assets/javascripts/discourse/templates/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/tags.hbs
@@ -1,11 +1,3 @@
-{{#d-section pageClass="tags"}}
-  <div class="container list-container">
-    <div class="row">
-      <div class="full-width">
-        <div id='list-area'>
-          {{outlet}}
-        </div>
-      </div>
-    </div>
-  </div>
-{{/d-section}}
+{{#d-section pageClass="tags" tagName=""}}
+  {{outlet}}
+{{/d-section}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 1196908497b..7d2f6578403 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -4,6 +4,7 @@
 
 <div class="list-controls">
   <div class="container">
+    <section class="navigation-container">
     {{#if tagNotification}}
       {{#unless additionalTags}}
         {{tag-notifications-button action="changeTagNotification"
@@ -11,10 +12,10 @@
       {{/unless}}
     {{/if}}
 
-    {{#if showAdminControls}}
-      {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
-      {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
-    {{/if}}
+      {{#if showAdminControls}}
+        {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
+        {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
+      {{/if}}
 
     {{create-topic-button
       canCreateTopic=canCreateTopic
@@ -40,35 +41,42 @@
         {{/each}}
       </h2>
     {{/if}}
+    </section>
   </div>
 </div>
 
 {{plugin-outlet name="discovery-list-container-top"}}
+<div class="container list-container">
+  <div class="row">
+    <div class="full-width">
+      <div id='list-area'>
+      {{conditional-loading-spinner condition=loading}}
 
-{{conditional-loading-spinner condition=loading}}
+      {{#unless loading}}
+        {{#if list.topics}}
+          {{#discovery-topics-list model=list refresh="refresh"}}
+          {{bulk-select-button selected=selected action="refresh"}}
 
-{{#unless loading}}
-  {{#if list.topics}}
-    {{#discovery-topics-list model=list refresh="refresh"}}
-    {{bulk-select-button selected=selected action="refresh"}}
-
-    {{topic-list topics=list.topics
-                 canBulkSelect=canBulkSelect
-                 toggleBulkSelect="toggleBulkSelect"
-                 bulkSelectEnabled=bulkSelectEnabled
-                 selected=selected
-                 showPosters=true
-                 order=order
-                 ascending=ascending
-                 changeSort="changeSort"}}
-
-    {{/discovery-topics-list}}
-  {{else}}
-    <footer class='topic-list-bottom'>
-      <h3>
-        {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
-      </h3>
-    </footer>
-  {{/if}}
-{{/unless}}
+          {{topic-list topics=list.topics
+                      canBulkSelect=canBulkSelect
+                      toggleBulkSelect="toggleBulkSelect"
+                      bulkSelectEnabled=bulkSelectEnabled
+                      selected=selected
+                      showPosters=true
+                      order=order
+                      ascending=ascending
+                      changeSort="changeSort"}}
 
+          {{/discovery-topics-list}}
+        {{else}}
+          <footer class='topic-list-bottom'>
+            <h3>
+              {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
+            </h3>
+          </footer>
+        {{/if}}
+      {{/unless}}
+      </div>
+    </div>
+  </div>
+</div>