diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index d8e88712c4f..c7746a6d4a6 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -1,5 +1,4 @@
 <div class="container">
-  {{global-notice}}
   <div class="row">
     <div class="full-width">
 
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 23822e0f409..7eb87f79e34 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,6 +1,10 @@
 {{render "header"}}
 
-<div id='main-outlet' class='wrap'>
+<div id="main-outlet" class="wrap">
+  <div class="container">
+    {{custom-html "top"}}
+    {{global-notice}}
+  </div>
   {{outlet}}
   {{render "user-card"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 195db18b2e7..1e4548bbe26 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,10 +1,8 @@
-<div class='container'>
-  {{custom-html "top"}}
-  {{global-notice}}
+<div class="container">
   {{discourse-banner user=currentUser banner=site.banner}}
 </div>
 
-<div class='list-controls'>
+<div class="list-controls">
   <div class="container">
     {{outlet "navigation-bar"}}
   </div>
@@ -12,17 +10,17 @@
 
 {{conditional-loading-spinner condition=loading}}
 
-<div class="container list-container {{if loading 'hidden'}}">
+<div class="container list-container {{if loading "hidden"}}">
   <div class="row">
     <div class="full-width">
-      <div id='header-list-area'>
+      <div id="header-list-area">
         {{outlet "header-list-container"}}
       </div>
     </div>
   </div>
   <div class="row">
     <div class="full-width">
-      <div id='list-area'>
+      <div id="list-area">
         {{plugin-outlet "discovery-list-container-top"}}
         {{outlet "list-container"}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 5267a9febc9..c3fd2fdc489 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -1,25 +1,23 @@
-<div class='container'>
-  {{custom-html "top"}}
-  {{global-notice}}
-  {{#if model}}
+{{#if model}}
+  <div class="container">
     {{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}}
-  {{/if}}
-</div>
+  </div>
+{{/if}}
 
 {{plugin-outlet "topic-above-post-stream"}}
 
 {{#if model.postStream.loaded}}
   {{#if model.postStream.firstPostPresent}}
-    <div id='topic-title'>
-      <div class='container'>
+    <div id="topic-title">
+      <div class="container">
 
         <div class="title-wrapper">
           {{#if editingTopic}}
             {{#if model.isPrivateMessage}}
               <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
-              {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}}
+              {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}}
             {{else}}
-              {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}}
+              {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}}
               <br>
               {{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}}
             {{/if}}
@@ -36,13 +34,13 @@
 
               {{#if model.details.loaded}}
                 {{topic-status topic=model}}
-                <a href='{{unbound model.url}}' {{action "jumpTop"}} class='fancy-title'>
+                <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
                   {{{model.fancyTitle}}}
                 </a>
               {{/if}}
 
               {{#if model.details.can_edit}}
-                <a href {{action "editTopic"}} class='edit-topic' title='{{i18n 'edit'}}'>{{fa-icon "pencil"}}</a>
+                <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{fa-icon "pencil"}}</a>
               {{/if}}
             </h1>
 
@@ -61,10 +59,10 @@
     {{view "selected-posts"}}
 
     <div class="row">
-      <section class="topic-area" id='topic' data-topic-id='{{unbound model.id}}'>
-        <div class='posts-wrapper'>
+      <section class="topic-area" id="topic" data-topic-id="{{unbound model.id}}">
+        <div class="posts-wrapper">
 
-          {{render 'topic-progress'}}
+          {{render "topic-progress"}}
 
           {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
 
@@ -83,21 +81,21 @@
 
           {{conditional-loading-spinner condition=model.postStream.loadingBelow}}
         </div>
-        <div id='topic-bottom'></div>
+        <div id="topic-bottom"></div>
 
         {{#conditional-loading-spinner condition=model.postStream.loadingFilter}}
           {{#if loadedAllPosts}}
 
-            {{view 'topic-closing' topic=model}}
-            {{view 'topic-footer-buttons' topic=model}}
+            {{view "topic-closing" topic=model}}
+            {{view "topic-footer-buttons" topic=model}}
 
             {{#if model.pending_posts_count}}
-              <div class='has-pending-posts'>
+              <div class="has-pending-posts">
                 {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
 
-                {{#link-to 'queued-posts'}}
-                  {{fa-icon 'check'}}
-                  {{i18n 'queue.view_pending'}}
+                {{#link-to "queued-posts"}}
+                  {{fa-icon "check"}}
+                  {{i18n "queue.view_pending"}}
                 {{/link-to}}
               </div>
             {{/if}}
@@ -105,9 +103,9 @@
             {{plugin-outlet "topic-above-suggested"}}
 
             {{#if model.details.suggested_topics.length}}
-              <div id='suggested-topics'>
-                <h3>{{i18n 'suggested_topics.title'}}</h3>
-                <div class='topics'>
+              <div id="suggested-topics">
+                <h3>{{i18n "suggested_topics.title"}}</h3>
+                <div class="topics">
                   {{basic-topic-list topics=model.details.suggested_topics postsAction="showTopicEntrance"}}
                 </div>
                 <h3>{{{view.browseMoreMessage}}}</h3>
@@ -122,10 +120,10 @@
 
   </div>
 {{else}}
-  <div class='container'>
+  <div class="container">
     {{#conditional-loading-spinner condition=noErrorYet}}
       {{#if model.notFoundHtml}}
-        <div class='not-found'>{{{model.notFoundHtml}}}</div>
+        <div class="not-found">{{{model.notFoundHtml}}}</div>
       {{else}}
         <div class="topic-error">
           <div>{{model.message}}</div>
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index f042fa2635d..a21b59dd92c 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -1,8 +1,3 @@
-<div class='container'>
-  {{custom-html "top"}}
-  {{global-notice}}
-</div>
-
 <div class="container">
   <section class='user-main'>
     <section {{bind-attr class="collapsedInfo :about model.profileBackground:has-background:no-background"}}  style={{model.profileBackground}}>