diff --git a/assets/css/main.css b/assets/css/main.css
new file mode 100644
index 0000000..8feb856
--- /dev/null
+++ b/assets/css/main.css
@@ -0,0 +1,16 @@
+/*
+ *  This file is part of 3words
+ *
+ *  (c) 2014 Leafcat Coding -- http://leafc.at
+ *
+ *  License: AGPLv3, see LICENSE for full license text
+ *
+ *  This file was touched by:
+ *    - pixeldesu <pixeldesu@nerdwerks.org>
+ *
+ */
+
+.rowm {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/views/inbox.html b/views/inbox.html
index 3da583c..1e767dc 100644
--- a/views/inbox.html
+++ b/views/inbox.html
@@ -7,8 +7,8 @@
 <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>
+      <li class="active"><a href="#">Inbox</a></li>
+      <li><a href="ucp.php?page=settings">Settings</a></li>
     </ul>
   </div>
   <div class="col-md-9">
diff --git a/views/index.html b/views/index.html
index 5b477a9..acca937 100644
--- a/views/index.html
+++ b/views/index.html
@@ -4,16 +4,16 @@
 {if="$message"}
 <div class="alert alert-info">{$message}</div>
 {/if}
-<h1>{$site_name}!</h1>
-<p>Want to tell them who you are? <input id="author" type="text" class="form-control" placeholder="Anonymous"></p>
+<h1 class="text-center">{$site_name}!</h1>
+<p class="text-center">Want to tell them who you are? <input id="author" type="text" class="input-xs" placeholder="Anonymous"></p>
 <div class="row">
-  <div class="col-md-4">
+  <div class="col-md-4 rowm">
     <input id="word1" type="text" class="form-control" placeholder="First Word">
   </div>
-  <div class="col-md-4">
+  <div class="col-md-4 rowm">
     <input id="word2" type="text" class="form-control" placeholder="Second Word">
   </div>
-  <div class="col-md-4">
+  <div class="col-md-4 rowm">
     <input id="word3" type="text" class="form-control" placeholder="Third Word">
   </div>
 </div>
diff --git a/views/layout.html b/views/layout.html
index 82db790..1086bdc 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{$site_name}</title>
     <link href="assets/css/bootstrap.min.css" rel="stylesheet">
+    <link href="assets/css/main.css" rel="stylesheet">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="assets/js/bootstrap.min.js"></script>
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
diff --git a/views/settings.html b/views/settings.html
index fa31bf5..9599b14 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -7,8 +7,8 @@
 <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>
+      <li><a href="ucp.php?page=inbox">Inbox</a></li>
+      <li class="active"><a href="#">Settings</a></li>
     </ul>
   </div>
   <div class="col-md-9">