diff --git a/views/inbox.html b/views/inbox.html
index 8c4dc10..e5be4d2 100644
--- a/views/inbox.html
+++ b/views/inbox.html
@@ -7,17 +7,17 @@
 <div class="row">
   <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
-      <li class="active"><a href="#">Inbox</a></li>
+      <li class="active"><a href="ucp.php?page=inbox">Inbox</a></li>
       <li><a href="ucp.php?page=settings">Settings</a></li>
     </ul>
   </div>
   <div class="col-md-9">
-  <h4>Answers you got:</h4>
+  <h4>Words sent to you:</h4>
   <table class="table table-responsive table-bordered table-condensed">
     <tbody>
     {loop="$words"}
       <tr>
-        <td><b>{$value.author}</b> wrote that you are <span class="label label-default">{$value.word1}</span>, <span class="label label-default">{$value.word2}</span> and <span class="label label-default">{$value.word3}</span></td>
+        <td><b>{$value.author}</b> thinks that you are <span class="label label-default">{$value.word1}</span>, <span class="label label-default">{$value.word2}</span> and <span class="label label-default">{$value.word3}</span></td>
       </tr>
     {/loop}
     </tbody>
diff --git a/views/settings.html b/views/settings.html
index 57f1c72..5730f0c 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -8,22 +8,22 @@
   <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
       <li><a href="ucp.php?page=inbox">Inbox</a></li>
-      <li class="active"><a href="#">Settings</a></li>
+      <li class="active"><a href="ucp.php?page=settings">Settings</a></li>
     </ul>
   </div>
   <div class="col-md-9">
     <form role="form" action="ucp.php?page=settings" method="POST">
       <div class="form-group">
-        <label for="sitename">Site Name</label>
+        <label for="sitename">Site name</label>
         <input type="text" class="form-control" name="sitename" placeholder="3 words about your mom" value="{$site_name}">
       </div>
       <div class="checkbox">
         <label>
-          <input id="recent_check" name="recent_check" type="checkbox" onchange="a(!this.checked)"{if="$recent_public"} checked{/if}> Show Recent Answers
+          <input id="recent_check" name="recent_check" type="checkbox" onchange="a(!this.checked)"{if="$recent_public"} checked{/if}> Show recent words
         </label>
       </div>
       <div class="form-group">
-        <label for="recent">Recent Answers</label>
+        <label for="recent">Recent words</label>
         <input type="number" class="form-control" id="recent-count" name="recent_count" value="{$recent_count}"{if="!$recent_public"} disabled{/if}>
       </div>
       <button type="submit" class="btn btn-default" id="recent-btn">Submit</button>
@@ -32,14 +32,14 @@
     <hr/>
     <form role="form" action="ucp.php?page=settings" method="POST">
       <div class="form-group">
-        <label for="password_change">New Password</label>
+        <label for="password_change">New password</label>
         <input type="password" class="form-control" name="password_change" placeholder="Password">
       </div>
       <div class="form-group">
-        <label for="password_verify">Repeat New Password</label>
+        <label for="password_verify">Repeat new password</label>
         <input type="password" class="form-control" name="password_verify" placeholder="Password">
       </div>
-      <button type="submit" class="btn btn-default">Change Password</button>
+      <button type="submit" class="btn btn-default">Change password</button>
       <input type="hidden" name="action" value="password">
     </form>
   </div>