diff --git a/.yo-rc.json b/.yo-rc.json
index 3cf0e28..6202fb8 100644
--- a/.yo-rc.json
+++ b/.yo-rc.json
@@ -38,4 +38,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/dashboard/dashboard.less b/dashboard/dashboard.less
index d7f5783..60b1382 100644
--- a/dashboard/dashboard.less
+++ b/dashboard/dashboard.less
@@ -2,5 +2,6 @@
 @import "partial/header/header.less";
 @import "partial/footer/footer.less";
 @import "partial/dashboard/dashboard.less";
+@import "partial/add-time-slice/add-time-slice.less";
 /* Add Component LESS Above */
 
diff --git a/dashboard/partial/add-time-slice/add-time-slice-spec.js b/dashboard/partial/add-time-slice/add-time-slice-spec.js
new file mode 100644
index 0000000..2bdbea3
--- /dev/null
+++ b/dashboard/partial/add-time-slice/add-time-slice-spec.js
@@ -0,0 +1,18 @@
+describe('AddTimeSliceCtrl', function() {
+
+	beforeEach(module('dashboard'));
+
+	var scope,ctrl;
+
+    beforeEach(inject(function($rootScope, $controller) {
+      scope = $rootScope.$new();
+      ctrl = $controller('AddTimeSliceCtrl', {$scope: scope});
+    }));
+
+	it('should ...', inject(function() {
+
+		expect(1).toEqual(1);
+
+	}));
+
+});
\ No newline at end of file
diff --git a/dashboard/partial/add-time-slice/add-time-slice.html b/dashboard/partial/add-time-slice/add-time-slice.html
new file mode 100644
index 0000000..b6fe332
--- /dev/null
+++ b/dashboard/partial/add-time-slice/add-time-slice.html
@@ -0,0 +1,17 @@
+<div ng-controller="AddTimeSliceCtrl">
+    <script type="text/ng-template" id="myModalContent.html">
+        <div class="modal-header">
+            <h3 class="modal-title">I'm a modal!</h3>
+        </div>
+        <div class="modal-body">
+            <ul>
+                testing
+            </ul>
+            Selected: <b>{{ selected.item }}</b>
+        </div>
+        <div class="modal-footer">
+            <button class="btn btn-primary" ng-click="ok()">OK</button>
+            <button class="btn btn-warning" ng-click="cancel()">Cancel</button>
+        </div>
+    </script>
+</div>
diff --git a/dashboard/partial/add-time-slice/add-time-slice.js b/dashboard/partial/add-time-slice/add-time-slice.js
new file mode 100644
index 0000000..c535a5f
--- /dev/null
+++ b/dashboard/partial/add-time-slice/add-time-slice.js
@@ -0,0 +1,11 @@
+angular.module('dashboard').controller('AddTimeSliceCtrl',function($scope, $modalInstance){
+
+    $scope.ok = function () {
+        $modalInstance.close();
+    };
+
+    $scope.cancel = function () {
+        $modalInstance.dismiss('cancel');
+    };
+
+});
diff --git a/dashboard/partial/add-time-slice/add-time-slice.less b/dashboard/partial/add-time-slice/add-time-slice.less
new file mode 100644
index 0000000..e69de29
diff --git a/dashboard/partial/dashboard/dashboard.html b/dashboard/partial/dashboard/dashboard.html
index 7baa957..17c7359 100644
--- a/dashboard/partial/dashboard/dashboard.html
+++ b/dashboard/partial/dashboard/dashboard.html
@@ -3,4 +3,3 @@
     Welcome,
     {{ currentUser }}
 </div>
-
diff --git a/dashboard/partial/footer/footer.html b/dashboard/partial/footer/footer.html
index 4a9d242..3e905ec 100644
--- a/dashboard/partial/footer/footer.html
+++ b/dashboard/partial/footer/footer.html
@@ -1,4 +1,6 @@
-<div class="col-md-12" ng-controller="FooterCtrl">
-footer
+<!-- FOOTER -->
+<footer  ng-controller="FooterCtrl">
+    <!--<p class="pull-right"><a href="#">Back to top</a></p>-->
+    <p>&copy; {{date | date:'yyyy'}} GATM &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
+</footer>
 
-</div>
diff --git a/dashboard/partial/footer/footer.js b/dashboard/partial/footer/footer.js
index ce8de38..bccf31b 100644
--- a/dashboard/partial/footer/footer.js
+++ b/dashboard/partial/footer/footer.js
@@ -1,4 +1,3 @@
 angular.module('dashboard').controller('FooterCtrl',function($scope){
-
-
-});
\ No newline at end of file
+    $scope.date = new Date();
+});
diff --git a/dashboard/partial/header/header.html b/dashboard/partial/header/header.html
index 7c377bf..963e1bb 100644
--- a/dashboard/partial/header/header.html
+++ b/dashboard/partial/header/header.html
@@ -1,5 +1,63 @@
-<div class="col-md-12" ng-controller="HeaderCtrl">
+<nav class="navbar navbar-default" ng-controller="HeaderCtrl">
+    <div class="container-fluid">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">GATM</a>
+        </div>
 
-header
-</div>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav">
+                <li>
+                    <button class="btn btn-default navbar-btn btn-success"  ng-click="open()" type="button">Add Entry</button>
+                </li>
+            </ul>
+            <form class="navbar-form navbar-left" role="search">
+                <div class="form-group">
+                    <input type="text" class="form-control" placeholder="Search">
+                </div>
+                <button type="submit" class="btn btn-default">Submit</button>
+            </form>
+            <ul class="nav navbar-nav navbar-right">
+                <li><a ui-sref="logout">Logout</a></li>
+            </ul>
+        </div><!-- /.navbar-collapse -->
+    </div><!-- /.container-fluid -->
+</nav>
+
+<div>
+    <script type="text/ng-template" id="myModalContent.html">
+        <div class="modal-header">
+            <h3 class="modal-title">Add time entry!</h3>
+        </div>
+        <div class="modal-body">
+            <div class="control-group">
+                <label class="control-label" for="hours">Hours</label>
+                <div class="controls">
+                    <input id="hours" name="hours" type="text" placeholder="Hours" class="input-mini" required="">
+
+                </div>
+            </div>
 
+            <!-- Text input-->
+            <div class="control-group">
+                <label class="control-label" for="description">Description</label>
+                <div class="controls">
+                    <input id="description" name="description" type="text" placeholder="description" class="input-xlarge" required="">
+
+                </div>
+            </div>
+            
+        </div>
+        <div class="modal-footer">
+            <button class="btn btn-primary" ng-click="ok()">OK</button>
+            <button class="btn btn-warning" ng-click="cancel()">Cancel</button>
+        </div>
+    </script>
+</div>
diff --git a/dashboard/partial/header/header.js b/dashboard/partial/header/header.js
index b302c4b..a5428d4 100644
--- a/dashboard/partial/header/header.js
+++ b/dashboard/partial/header/header.js
@@ -1,4 +1,19 @@
-angular.module('dashboard').controller('HeaderCtrl',function($scope){
+angular.module('dashboard').controller('HeaderCtrl', function($scope, $modal){
 
+    $scope.open = function () {
+        var modalInstance = $modal.open({
+            templateUrl: 'myModalContent.html',
+            controller: 'AddTimeSliceCtrl',
+            resolve: {
+                items: function () {
+                    return $scope.items;
+                }
+            }
+        });
 
-});
\ No newline at end of file
+        modalInstance.result.then(function () {
+        }, function () {
+            console.log('Modal dismissed at: ' + new Date());
+        });
+    };
+});
diff --git a/index.html b/index.html
index bdef94e..adbf0e3 100755
--- a/index.html
+++ b/index.html
@@ -45,6 +45,7 @@
   <script src="directives/showErrors.js"></script>
   <script src="security/service/AuthInterceptor.js"></script>
   <script src="signup/service/Signup.js"></script>
+  <script src="dashboard/partial/add-time-slice/add-time-slice.js"></script>
   <!-- Add New Component JS Above -->
 
 
@@ -52,13 +53,7 @@
   <!--<div id="content" class="container" ui-view></div>-->
 
   <div ui-view="header"></div>
-  <div>
-      <div id="content" class="container">
-          <div class="row">
-              <div ui-view="body" autoscroll="true"></div>
-          </div>
-      </div>
-  </div>
+  <div ui-view="body" autoscroll="true"></div>
   <div ui-view="footer"></div>
 
 </body>