diff --git a/server/middlewares/error-handlers.js b/server/middlewares/error-handlers.js
index c8eefaef08..2563852653 100644
--- a/server/middlewares/error-handlers.js
+++ b/server/middlewares/error-handlers.js
@@ -24,9 +24,11 @@ export default function prodErrorHandler() {
 
     var message = 'opps! Something went wrong. Please try again later';
     if (type === 'html') {
-      req.flash('errors', {
-        msg: message
-      });
+      if (typeof req.flash === 'function') {
+        req.flash('errors', {
+          msg: message
+        });
+      }
       return res.redirect('/');
       // json
     } else if (type === 'json') {
diff --git a/server/views/partials/universal-head.jade b/server/views/partials/universal-head.jade
index 5b4bced349..da6ed4c914 100644
--- a/server/views/partials/universal-head.jade
+++ b/server/views/partials/universal-head.jade
@@ -14,3 +14,56 @@ meta(http-equiv='X-UA-Compatible', content='IE=edge')
 meta(name='viewport', content='width=device-width, initial-scale=1.0')
 meta(name='csrf-token', content=_csrf)
 script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
+script.
+    window.jQuery || document.write('<script src="/bower_components/jquery/dist/jquery.min.js"><\/script>');
+script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.js")
+script.
+    if (typeof window.angular === 'undefined') {
+        document.write('<script src="/bower_components/angular/angular.min.js"><\/script>')
+    }
+script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.0/ui-bootstrap.min.js")
+script.
+    try {
+        angular.module('ui.bootstrap');
+    } catch (e) {
+        document.write('<script src="/bower_components/angular-bootstrap/ui-bootstrap.min.js"><\/script>');
+    }
+script(src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js")
+script.
+    window.d3 || document.write('<script src="/bower_components/d3/d3.js"><\/script>');
+script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js")
+script.
+    if (typeof($.fn.modal) === 'undefined') {
+        document.write('<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"><\/script>');
+    }
+script(src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js")
+script.
+    window.moment || document.write('<script src="/bower_components/moment/min/moment.min.js"><\/script>');
+// Leave the below lines alone!
+script(src="/js/main_0.0.3.js")
+script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js")
+script(src="/bower_components/ramda/dist/ramda.min.js")
+script.
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-55446531-1', 'auto');
+    ga('require', 'displayfeatures');
+    ga('send', 'pageview');
+script#inspectletjs(type='text/javascript').
+    window.__insp = window.__insp || [];
+    __insp.push(['wid', 561999918]);
+    (function() {
+        function __ldinsp() {
+            var insp = document.createElement('script');
+            insp.type = 'text/javascript';
+            insp.async = true;
+            insp.id = "inspsync";
+            insp.src = '//cdn.inspectlet.com/inspectlet.js';
+            var x = document.getElementsByTagName('script')[0];
+            x.parentNode.insertBefore(insp, x);
+        }
+        if (window.attachEvent) window.attachEvent('onload', __ldinsp);
+        else window.addEventListener('load', __ldinsp, false);
+    })();
diff --git a/server/views/partials/universal-tail.jade b/server/views/partials/universal-tail.jade
index a3a4ec247b..e69de29bb2 100644
--- a/server/views/partials/universal-tail.jade
+++ b/server/views/partials/universal-tail.jade
@@ -1,53 +0,0 @@
-script.
-    window.jQuery || document.write('<script src="/bower_components/jquery/dist/jquery.min.js"><\/script>');
-script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.js")
-script.
-    if (typeof window.angular === 'undefined') {
-        document.write('<script src="/bower_components/angular/angular.min.js"><\/script>')
-    }
-script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.0/ui-bootstrap.min.js")
-script.
-    try {
-        angular.module('ui.bootstrap');
-    } catch (e) {
-        document.write('<script src="/bower_components/angular-bootstrap/ui-bootstrap.min.js"><\/script>');
-    }
-script(src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js")
-script.
-    window.d3 || document.write('<script src="/bower_components/d3/d3.js"><\/script>');
-script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js")
-script.
-    if (typeof($.fn.modal) === 'undefined') {
-        document.write('<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"><\/script>');
-    }
-script(src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js")
-script.
-    window.moment || document.write('<script src="/bower_components/moment/min/moment.min.js"><\/script>');
-// Leave the below lines alone!
-script(src="/js/main_0.0.3.js")
-script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js")
-script(src="/bower_components/ramda/dist/ramda.min.js")
-script.
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-55446531-1', 'auto');
-    ga('require', 'displayfeatures');
-    ga('send', 'pageview');
-script#inspectletjs(type='text/javascript').
-    window.__insp = window.__insp || [];
-    __insp.push(['wid', 561999918]);
-    (function() {
-        function __ldinsp() {
-            var insp = document.createElement('script');
-            insp.type = 'text/javascript';
-            insp.async = true;
-            insp.id = "inspsync";
-            insp.src = '//cdn.inspectlet.com/inspectlet.js';
-            var x = document.getElementsByTagName('script')[0];
-            x.parentNode.insertBefore(insp, x);
-        }
-        if (window.attachEvent) window.attachEvent('onload', __ldinsp);
-        else window.addEventListener('load', __ldinsp, false);
-    })();