diff --git a/css/styles.css b/css/styles.css
index f07b8e3..d9ee476 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -1,3 +1,4 @@
+/* Layout */
 .container.main-content {
   display: flex;
   margin-top: 70px;
@@ -5,16 +6,17 @@
   max-width: 100%;
 }
 .menu-container {
-  width: 5%;
+  width: 8%;
 }
 .main-content-container {
-  width: 95%;
+  width: 92%;
   padding: 0 20px;
 }
 .login-container {
   top: 25vh;
 }
-/**/
+
+/* Common CSS */
 .cp {
   cursor: pointer;
 }
@@ -23,6 +25,18 @@
   flex-direction: row;
   justify-content: space-between;
 }
+.white-well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #FFFFFF;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+}
+
+/* Side Menu */
 .side-menu {
   padding-top: 10px;
   max-width: 100px;
@@ -35,8 +49,8 @@
   color: black;
 }
 .side-menu-button {
-  width: 50px;
-  height: 50px;
+  width: 65px;
+  height: 65px;
 }
 .achievement-body {
   display: flex;
@@ -44,13 +58,13 @@
   justify-content: space-between;
   align-items: center;
 }
-.white-well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #FFFFFF;
-  border: 1px solid #e3e3e3;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+.button-container.active .side-menu-button {
+  background: steelblue;
+  color: white;
+}
+.button-container.active .button-title {
+  color: steelblue;
+}
+.button-container a:hover {
+  text-decoration: none;
 }
diff --git a/js/directives/notificationDirective.js b/js/directives/notificationDirective.js
index 590296a..7dad58a 100644
--- a/js/directives/notificationDirective.js
+++ b/js/directives/notificationDirective.js
@@ -1,5 +1,5 @@
 app.directive('notificationDirective', function() {
   return {
-    templateUrl: "_notification-widget.html"
+    templateUrl: "templates/widgets/notification-widget.html"
   };
 });
diff --git a/js/directives/todoDirective.js b/js/directives/todoDirective.js
index 2396b94..c7c49f7 100644
--- a/js/directives/todoDirective.js
+++ b/js/directives/todoDirective.js
@@ -1,5 +1,5 @@
 app.directive('todoDirective', function() {
   return {
-    templateUrl: "_todo-widget.html"
+    templateUrl: "templates/widgets/todo-widget.html"
   };
 });
diff --git a/js/directives/uploadDirective.js b/js/directives/uploadDirective.js
index ba6adc7..8fbe4e6 100644
--- a/js/directives/uploadDirective.js
+++ b/js/directives/uploadDirective.js
@@ -1,5 +1,5 @@
 app.directive('uploadDirective', function() {
   return {
-    templateUrl: "_upload-widget.html"
+    templateUrl: "templates/widgets/upload-widget.html"
   };
 });
diff --git a/templates/dns.html b/templates/dns.html
index 6927d9a..7a387db 100644
--- a/templates/dns.html
+++ b/templates/dns.html
@@ -4,8 +4,8 @@
     <h4 class="text-center">Advanced Features Ahead</h4><br>
     <p class="text-center">This space is intended for<br> people that need more functionality<br> than the average bear</p><br>
     <div class="text-center">
-      <a href="#!/home" class="btn btn-default"><link href="#">I'd like to go home, please</a><br><br>
-      <a ng-click="vm.unlock('honeybadger')">I don't care, let me through</a>
+      <a ng-href="/#!/launchpad-home" class="btn btn-default">I'd like to go home, please</a><br><br>
+      <a>I don't care, let me through</a>
     </div>
   </div>
 </div>
diff --git a/_notification-widget.html b/templates/widgets/notification-widget.html
similarity index 100%
rename from _notification-widget.html
rename to templates/widgets/notification-widget.html
diff --git a/_todo-widget.html b/templates/widgets/todo-widget.html
similarity index 100%
rename from _todo-widget.html
rename to templates/widgets/todo-widget.html
diff --git a/_upload-widget.html b/templates/widgets/upload-widget.html
similarity index 100%
rename from _upload-widget.html
rename to templates/widgets/upload-widget.html