diff --git a/app/frontend/src/javascript/services/auth.js.erb b/app/frontend/src/javascript/services/auth.js
similarity index 100%
rename from app/frontend/src/javascript/services/auth.js.erb
rename to app/frontend/src/javascript/services/auth.js
diff --git a/app/frontend/templates/shared/header.html b/app/frontend/templates/shared/header.html.erb
similarity index 96%
rename from app/frontend/templates/shared/header.html
rename to app/frontend/templates/shared/header.html.erb
index ba4d6026a..4c9df7044 100644
--- a/app/frontend/templates/shared/header.html
+++ b/app/frontend/templates/shared/header.html.erb
@@ -3,6 +3,7 @@
     <a ng-click="toggleNavSize($event)" class="btn btn-link visible-xs" data-toggle="class:nav-off-screen" data-target="#nav"><i class="fa fa-bars"></i></a>
     <a ui-sref="app.public.home" class="navbar-brand" ng-click="goabout = false">
       <img ng-src="{{logo.custom_asset_file_attributes.attachment_url}}" alt="{{logo.custom_asset_file_attributes.attachment}}" class="m-r-sm"/>
+      <%= raw "<label class='label-staging label label-warning text-sm hidden-sm hidden-xs'>Staging</label>" if Rails.env.staging? %>
     </a>
   </div>
 
diff --git a/config/webpack/loaders/html_erb.js b/config/webpack/loaders/html_erb.js
index a9d26236a..1e676649d 100644
--- a/config/webpack/loaders/html_erb.js
+++ b/config/webpack/loaders/html_erb.js
@@ -1,7 +1,7 @@
 module.exports = {
   test: /\.html\.erb$/,
   loader: [
+    'html-loader',
     'rails-erb-loader',
-    'html-loader'
   ]
 };
diff --git a/config/webpack/loaders/sass_erb.js b/config/webpack/loaders/sass_erb.js
index 9298b7851..a379bbce0 100644
--- a/config/webpack/loaders/sass_erb.js
+++ b/config/webpack/loaders/sass_erb.js
@@ -3,6 +3,7 @@ module.exports = {
   enforce: 'pre',
   exclude: /node_modules/,
   loader: [
+    'sass-loader',
     'rails-erb-loader'
   ]
 };