diff --git a/app/app.js b/app/app.js
index fd2ec8608..10d2ce8ca 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters'])
+angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead'])
     .config(['$routeProvider', function ($routeProvider) {
         $routeProvider.when('/', {templateUrl: 'partials/dashboard.html', controller: 'DashboardController'});
         $routeProvider.when('/containers/', {templateUrl: 'partials/containers.html', controller: 'ContainersController'});
diff --git a/partials/masthead.html b/app/components/masthead/masthead.html
similarity index 100%
rename from partials/masthead.html
rename to app/components/masthead/masthead.html
diff --git a/app/components/masthead/mastheadController.js b/app/components/masthead/mastheadController.js
new file mode 100644
index 000000000..f160ae6bc
--- /dev/null
+++ b/app/components/masthead/mastheadController.js
@@ -0,0 +1,4 @@
+angular.module('masthead', [])
+.controller('MastheadController', function($scope) {
+    $scope.template = 'app/components/masthead/masthead.html';
+});
diff --git a/app/controllers.js b/app/controllers.js
index a01586ea5..28a04a3d9 100644
--- a/app/controllers.js
+++ b/app/controllers.js
@@ -1,8 +1,3 @@
-
-function MastheadController($scope) {
-    $scope.template = 'partials/masthead.html';
-}
-
 function newLineChart(id, data, getkey) {
     var chart = getChart(id);
     var map = {};
diff --git a/index.html b/index.html
index d63b15561..7b3cb17b5 100644
--- a/index.html
+++ b/index.html
@@ -36,6 +36,8 @@
     <script src="app/services.js"></script>
     <script src="app/filters.js"></script>
     <script src="app/controllers.js"></script>
+    <!-- TODO: Add minification build step -->
+    <script src="app/components/masthead/mastheadController.js"></script>
     <script src="app/viewmodel.js"></script>
 
     <!-- Fav and touch icons -->