diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
index 2d2fd66..94b5f19 100644
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -7,52 +7,55 @@
     @menu("profile")
   </div>
   <div class="span9">
+    @helper.html.information(info)
     <form action="@url(account.userName)/_edit" method="POST" validate="true">
-      <h3>Edit your profile</h3>
-      @helper.html.information(info)
-      <div class="row-fluid">
-        <div class="span6">
-          @if(account.password.nonEmpty){
+    <div class="box">
+      <div class="box-header">Profile</div>
+      <div class="box-content">
+        <div class="row-fluid">
+          <div class="span6">
+            @if(account.password.nonEmpty){
+              <fieldset>
+                <label for="password" class="strong">
+                  Password (input to change password):
+                </label>
+                <input type="password" name="password" id="password" value=""/>
+                <span id="error-password" class="error"></span>
+              </fieldset>
+            }
             <fieldset>
-              <label for="password" class="strong">
-                Password (input to change password):
-              </label>
-              <input type="password" name="password" id="password" value=""/>
-              <span id="error-password" class="error"></span>
+              <label for="fullName" class="strong">Full Name:</label>
+              <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
+              <span id="error-fullName" class="error"></span>
             </fieldset>
-          }
-          <fieldset>
-            <label for="fullName" class="strong">Full Name:</label>
-            <input type="text" name="fullName" id="fullName" value="@account.fullName)"/>
-            <span id="error-fullName" class="error"></span>
-          </fieldset>
-          <fieldset>
-            <label for="mailAddress" class="strong">Mail Address:</label>
-            <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress)"/>
-            <span id="error-mailAddress" class="error"></span>
-          </fieldset>
-          <fieldset>
-            <label for="url" class="strong">URL (optional):</label>
-            <input type="text" name="url" id="url" style="width: 300px;" value="@account.url)"/>
-            <span id="error-url" class="error"></span>
-          </fieldset>
+            <fieldset>
+              <label for="mailAddress" class="strong">Mail Address:</label>
+              <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
+              <span id="error-mailAddress" class="error"></span>
+            </fieldset>
+            <fieldset>
+              <label for="url" class="strong">URL (optional):</label>
+              <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
+              <span id="error-url" class="error"></span>
+            </fieldset>
+          </div>
+          <div class="span6">
+            <fieldset>
+              <label for="avatar" class="strong">Image (optional):</label>
+              @helper.html.uploadavatar(Some(account))
+            </fieldset>
+          </div>
         </div>
-        <div class="span6">
-          <fieldset>
-            <label for="avatar" class="strong">Image (optional):</label>
-            @helper.html.uploadavatar(Some(account))
-          </fieldset>
+        <div style="margin-top: 20px;">
+          <div class="pull-right">
+            <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+          </div>
+          <input type="submit" class="btn btn-success" value="Save"/>
+          <a href="@url(account.userName)" class="btn">Cancel</a>
         </div>
       </div>
-      <fieldset class="margin">
-        <div class="pull-right">
-          <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
-        </div>
-        <input type="submit" class="btn btn-success" value="Save"/>
-        <a href="@url(account.userName)" class="btn">Cancel</a>
-      </fieldset>
-    </form>
-  </div>
+    </div>
+  </form>
 </div>
 }
 <script>
diff --git a/src/main/twirl/account/ssh.scala.html b/src/main/twirl/account/ssh.scala.html
index b20a5eb..56f7aa7 100644
--- a/src/main/twirl/account/ssh.scala.html
+++ b/src/main/twirl/account/ssh.scala.html
@@ -10,7 +10,13 @@
     <div class="box">
       <div class="box-header">SSH Keys</div>
       <div class="box-content">
-        @sshKeys.map { key =>
+        @if(sshKeys.isEmpty){
+          No keys
+        }
+        @sshKeys.zipWithIndex.map { case (key, i) =>
+          @if(i != 0){
+            <hr>
+          }
           <strong>@key.title</strong>
           <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
         }