diff --git a/src/app/error/error.js b/src/app/error/error.js
index f5a3b51c..2273e4a4 100644
--- a/src/app/error/error.js
+++ b/src/app/error/error.js
@@ -1,20 +1,7 @@
-//angular.module('home', []).config(function ($routeProvider, $httpProvider) {
-//
-//    $routeProvider.
-//        when('/', {templateUrl: '/assets/home.html',   controller: HomeCtrl}).
-//        otherwise({redirectTo: '/'});
-//
-//    //$httpProvider.defaults.headers.
-//      //  common['X-CSRF-Token'] = $['meta[name=csrf-token]'].attr('content');
-//});
 angular.module("bawApp.error", [])
-    .controller("ErrorCtrl", ["$scope",
-
-
-        function ErrorCtrl($scope) {
-
+    .controller("ErrorController", [
+        "$scope",
+        function ErrorController($scope) {
             $scope.message = "We can't seem to find what you are looking for (404)";
-
-
         }
     ]);
diff --git a/src/app/error/error_404.tpl.html b/src/app/error/error404.tpl.html
similarity index 100%
rename from src/app/error/error_404.tpl.html
rename to src/app/error/error404.tpl.html
diff --git a/src/baw.paths.nobuild.js b/src/baw.paths.nobuild.js
index 159ce1b8..16659657 100644
--- a/src/baw.paths.nobuild.js
+++ b/src/baw.paths.nobuild.js
@@ -83,7 +83,7 @@ module.exports = function (environment) {
             // The following intentionally are not prefixed with a '/'
             // static files
             "files": {
-                "error404": "error/error_404.tpl.html",
+                "error404": "error/error404.tpl.html",
                 "home": "home/home.tpl.html",
                 "login": {
                     "loginWidget": "login/widget/loginWidget.tpl.html"
diff --git a/src/index.html b/src/index.html
index 5fc91139..0f9b0b13 100644
--- a/src/index.html
+++ b/src/index.html
@@ -92,8 +92,8 @@
 
         <!-- each view must specify the controller they use -->
         <div id="content-wrapper"
-             class="col-md-pull-2 col-sm-12"
-             ng-class="{ 'col-md-12': fullWidth, 'col-md-8': !fullWidth }"
+             class="col-sm-12"
+             ng-class="{ 'col-md-12': fullWidth, 'col-md-8': !fullWidth, 'col-md-pull-2': !fullWidth }"
              ng-view autoscroll>
         </div>