diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index 2b722ee..d2d8f6e 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -16,24 +16,27 @@
           @if(personalTokens.isEmpty && gneratedToken.isEmpty){
             No tokens.
           } else {
-            Tokens you have generated that can be used to access the GitBucket API.<hr>
+            Tokens you have generated that can be used to access the GitBucket API.
+            <hr style="margin-top: 10px;">
           }
           @gneratedToken.map{ case (token, tokenString) =>
             <div class="alert alert-info">
               Make sure to copy your new personal access token now. You won't be able to see it again!
             </div>
-            @helper.html.copy("generated-token-copy", tokenString){
-              <input type="text" value="@tokenString" style="width:21em" readonly>
-            }
-            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-mini btn-danger pull-right">Delete</a>
-            <hr>
+            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
+            <div style="width: 50%;">
+              @helper.html.copy("generated-token-copy", tokenString){
+                <input type="text" value="@tokenString" class="form-control input-sm" readonly>
+              }
+            </div>
+            <hr style="margin-top: 10px;">
           }
           @personalTokens.zipWithIndex.map { case (token, i) =>
             @if(i != 0){
-              <hr>
+              <hr style="margin-top: 10px;">
             }
             <strong>@token.note</strong>
-            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-mini btn-danger pull-right">Delete</a>
+            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
           }
         </div>
       </div>
@@ -44,7 +47,7 @@
             <fieldset>
               <label for="note" class="strong">Token description</label>
               <div><span id="error-note" class="error"></span></div>
-              <input type="text" name="note" id="note" class="form-control" style="width: 400px;"/>
+              <input type="text" name="note" id="note" class="form-control"/>
               <p class="muted">What's this token for?</p>
             </fieldset>
             <input type="submit" class="btn btn-success" value="Generate token"/>
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index 7b1f2a0..34f8388 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -17,10 +17,10 @@
           }
           @sshKeys.zipWithIndex.map { case (key, i) =>
             @if(i != 0){
-              <hr>
+              <hr style="margin-top: 10px;">
             }
             <strong>@key.title</strong> (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
-            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
+            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-sm btn-danger pull-right">Delete</a>
           }
         </div>
       </div>
@@ -31,12 +31,12 @@
             <fieldset class="form-group">
               <label for="title" class="strong">Title</label>
               <div><span id="error-title" class="error"></span></div>
-              <input type="text" name="title" id="title" class="form-control" style="width: 400px;"/>
+              <input type="text" name="title" id="title" class="form-control"/>
             </fieldset>
             <fieldset class="form-group">
               <label for="publicKey" class="strong">Key</label>
               <div><span id="error-publicKey" class="error"></span></div>
-              <textarea name="publicKey" id="publicKey" class="form-control" style="width: 600px; height: 250px;"></textarea>
+              <textarea name="publicKey" id="publicKey" class="form-control" style="height: 250px;"></textarea>
             </fieldset>
             <input type="submit" class="btn btn-success" value="Add"/>
           </div>