diff --git a/views/inbox.html b/views/inbox.html
index 30c89b5..7aa1a0f 100644
--- a/views/inbox.html
+++ b/views/inbox.html
@@ -1,9 +1,23 @@
-<h4>Answers you got:</h4>
-
-<table class="table table-responsive table-bordered table-condensed">
-<tbody>
-{loop="$words"}
-  <td>{$value.author} wrote that you are <span class="label label-default">{$value.first}</span>, <span class="label label-default">{$value.second}</span> and <span class="label label-default">{$value.third}</span></td>
-{/loop}
-</tbody>
-</table>
\ No newline at end of file
+{include="layout"}
+{include="navbar"}
+<div class="container">
+<div class="row">
+  <div class="col-md-3">
+    <ul class="nav nav-pills nav-stacked nav-justified">
+      <li class="active">Inbox</li>
+      <li>Settings</li>
+    </ul>
+  </div>
+  <div class="col-md-9">
+  <h4>Answers you got:</h4>
+  <table class="table table-responsive table-bordered table-condensed">
+    <tbody>
+    {loop="$words"}
+      <td>{$value.author} wrote that you are <span class="label label-default">{$value.first}</span>, <span class="label label-default">{$value.second}</span> and <span class="label label-default">{$value.third}</span></td>
+    {/loop}
+    </tbody>
+  </table>
+  </div>
+</div>
+</div>
+{include="footer"}
diff --git a/views/login.html b/views/login.html
index 0a10417..d2ce75d 100644
--- a/views/login.html
+++ b/views/login.html
@@ -1,12 +1,17 @@
-<form role="form" method="POST">
-  <div class="form-group">
-    <label for="InputUsername">Username</label>
-    <input type="text" class="form-control" id="InputUsername" name="user_name" placeholder="Enter username">
-  </div>
-  <div class="form-group">
-    <label for="InputPassword">Password</label>
-    <input type="password" class="form-control" id="InputUsername" name="password" placeholder="Enter password">
-  </div>
-  <input type="hidden" name="login">
-  <button type="submit" class="btn btn-default btn-block">Login</button>
-</form>
\ No newline at end of file
+{include="layout"}
+{include="navbar"}
+<div class="container">
+  <form role="form" method="POST">
+    <div class="form-group">
+      <label for="InputUsername">Username</label>
+      <input type="text" class="form-control" id="InputUsername" name="user_name" placeholder="Enter username">
+    </div>
+    <div class="form-group">
+      <label for="InputPassword">Password</label>
+      <input type="password" class="form-control" id="InputUsername" name="password" placeholder="Enter password">
+    </div>
+    <input type="hidden" name="login">
+    <button type="submit" class="btn btn-default btn-block">Login</button>
+  </form>
+</div>
+{include="footer"}
\ No newline at end of file
diff --git a/views/settings.html b/views/settings.html
index 12bff7d..31ec6c9 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -1,29 +1,44 @@
-<form role="form">
-  <div class="form-group">
-    <label for="sitename">Site Name</label>
-    <input type="text" class="form-control" id="sitename" placeholder="3 words about your mom">
+{include="layout"}
+{include="navbar"}
+<div class="container">
+<div class="row">
+  <div class="col-md-3">
+    <ul class="nav nav-pills nav-stacked nav-justified">
+      <li>Inbox</li>
+      <li class="active">Settings</li>
+    </ul>
   </div>
-  <div class="checkbox">
-    <label>
-      <input id="recent_check" type="checkbox"> Showing Recent Answers
-    </label>
+  <div class="col-md-9">
+    <form role="form">
+      <div class="form-group">
+        <label for="sitename">Site Name</label>
+        <input type="text" class="form-control" id="sitename" placeholder="3 words about your mom">
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="recent_check" type="checkbox"> Showing Recent Answers
+        </label>
+      </div>
+      <!-- TODO: Javascript disabling this form if above checkbox is unchecked -->
+      <div class="form-group">
+        <label for="recent">Recent Answers</label>
+        <input type="number" class="form-control" id="recent_count" value="5" disabled>
+      </div>
+      <button type="submit" class="btn btn-default">Submit</button>
+    </form>
+    <hr/>
+    <form role="form">
+      <div class="form-group">
+        <label for="password_change">New Password</label>
+        <input type="password" class="form-control" id="password_change" placeholder="Password">
+      </div>
+      <div class="form-group">
+        <label for="password_verify">Repeat New Password</label>
+        <input type="password" class="form-control" id="password_verify" placeholder="Password">
+      </div>
+      <button type="submit" class="btn btn-default">Change Password</button>
+    </form>
   </div>
-  <!-- TODO: Javascript disabling this form if above checkbox is unchecked -->
-  <div class="form-group">
-    <label for="recent">Recent Answers</label>
-    <input type="number" class="form-control" id="recent_count" value="5" disabled>
-  </div>
-  <button type="submit" class="btn btn-default">Submit</button>
-</form>
-<hr/>
-<form role="form">
-  <div class="form-group">
-    <label for="password_change">New Password</label>
-    <input type="password" class="form-control" id="password_change" placeholder="Password">
-  </div>
-  <div class="form-group">
-    <label for="password_verify">Repeat New Password</label>
-    <input type="password" class="form-control" id="password_verify" placeholder="Password">
-  </div>
-  <button type="submit" class="btn btn-default">Change Password</button>
-</form>
\ No newline at end of file
+</div>
+</div>
+{include="footer"}
\ No newline at end of file
diff --git a/views/ucp.html b/views/ucp.html
deleted file mode 100644
index 753b4f1..0000000
--- a/views/ucp.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{include="layout"}
-{include="navbar"}
-<div class="container">
-{if="$logged_in"}
-<div class="row">
-  <div class="col-md-3">
-    <ul class="nav nav-pills nav-stacked nav-justified">
-      <li {if="$ucp_page === 'inbox'"} class="active"{/if}>Inbox</li>
-      <li {if="$ucp_page === 'settings'"} class="active"{/if}>Settings</li>
-    </ul>
-  </div>
-  <div class="col-md-9">
-  {if="$ucp_page === 'inbox'"}
-    {include="inbox"}
-  {else}
-    {include="settings"}
-  {/if}
-  </div>
-</div>
-{else}
-  {include="login"}
-{/if}
-</div>
-{include="footer"}
\ No newline at end of file