diff --git a/app/overview/index.js b/app/overview/index.js
index 53c2c53..765cdf5 100644
--- a/app/overview/index.js
+++ b/app/overview/index.js
@@ -18,12 +18,36 @@
         // Route configuration
         .config(['$routeProvider', function ($routeProvider) {
             $routeProvider
+<<<<<<< HEAD
                 .when('/overview/system', {
                     'templateUrl': 'overview/controllers/system-overview-controller.html',
                     'controller': 'systemOverviewController',
                     authenticated: true
                 })
                 .when('/overview', {
+=======
+                .when('/overview/bmc-reboot', {
+                    'templateUrl': 'overview/controllers/bmc-reboot-controller.html',
+                    'controller': 'bmcRebootController',
+                    authenticated: true
+                })
+                .when('/overview/log', {
+                    'templateUrl': 'overview/controllers/log-controller.html',
+                    'controller': 'logController',
+                    authenticated: true
+                })
+                .when('/overview/power-operations', {
+                    'templateUrl': 'overview/controllers/power-operations-controller.html',
+                    'controller': 'powerOperationsController',
+                    authenticated: true
+                })
+                .when('/overview/unit-id', {
+                    'templateUrl': 'overview/controllers/unit-id-controller.html',
+                    'controller': 'unitIdController',
+                    authenticated: true
+                })
+                .when('/overview/system', {
+>>>>>>> 4c1a3dd... Major update to code structure
                     'templateUrl': 'overview/controllers/system-overview-controller.html',
                     'controller': 'systemOverviewController',
                     authenticated: true