diff --git a/css/glowingbear.css b/css/glowingbear.css
index 700e26d..ba94d13 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -681,6 +681,10 @@ li.buffer.indent.private a {
     font-size: small;
 }
 
+.lessleftpad {
+    padding-left: 5px;
+}
+
 .unselectable {
     -webkit-user-select: none;
     -moz-user-select: none;
@@ -931,4 +935,4 @@ code {
     padding: 0px 2px;
     color: #444;
     border: 1pt solid #444;
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index 495a9a4..4ae19fd 100644
--- a/index.html
+++ b/index.html
@@ -112,22 +112,6 @@
                       </div>
                     </div>
                   </div>
-                  <div class="input-group">
-                    <div class="row no-gutter">
-                      <div class="col-sm-9">
-                        <label class="control-label" for="iToken">Imgur Access token</label>
-                        <input type="text" class="form-control favorite-font" id="iToken" ng-model="settings.iToken" placeholder="Token" autocapitalize="off">
-                      </div>
-                    </div>
-                  </div>
-                  <div class="input-group">
-                    <div class="row no-gutter">
-                      <div class="col-sm-9">
-                        <label class="control-label" for="iAlb">Imgur Album hash<a target="_blank" href="https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash"><i class="glyphicon glyphicon-info-sign"></i></a></label>
-                        <input type="text" class="form-control favorite-font" id="iAlb" ng-model="settings.iAlb" placeholder="Album hash" autocapitalize="off">
-                      </div>
-                    </div>
-                  </div>
                   <div class="row no-gutter">
                     <div ng-class="settings.useTotp ? 'col-sm-9' : 'col-sm-12'" ng>
                       <label class="control-label" for="password">WeeChat relay password</label>
@@ -473,7 +457,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                     </div>
 
                     <label for="size" class="col-sm-1 control-label">Size</label>
-                    <div class="col-sm-2">
+                    <div class="col-sm-3">
                       <input type="text" ng-model="settings.fontsize" class="form-control" id="size">
                     </div>
                   </div>
@@ -483,7 +467,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                 <form class="form-horizontal" role="form">
                   <div class="form-group">
                     <label for="theme" class="col-sm-3 control-label make-thinner">Theme</label>
-                    <div class="col-sm-7">
+                    <div class="col-sm-8">
                       <select id="theme" class="form-control" ng-model="settings.theme" ng-options="theme for theme in themes"></select>
                     </div>
                   </div>
@@ -494,13 +478,28 @@ npm run build-electron-{windows, darwin, linux}</pre>
                 <form class="form-horizontal" role="form">
                   <div class="form-group">
                     <label for="custom-css" class="col-sm-3 control-label make-thinner">Custom CSS</label>
-                    <div class="col-sm-7">
+                    <div class="col-sm-8">
                       <textarea id="custom-css" class="form-control" ng-model="settings.customCSS"></textarea>
                     </div>
                   </div>
                 </form>
               </li>
 
+              <li class="standard-labels">
+                <form class="form-horizontal" role="form">
+                  <div class="form-group">
+                    <label class="control-label col-sm-3" for="iToken">Imgur Token <a target="_blank" href="https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash"><i class="glyphicon glyphicon-info-sign"></i></a></label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" ng-model="settings.iToken" placeholder="Access Token" autocapitalize="off">
+                    </div>
+                    <label class="control-label col-sm-1 lessleftpad" for="iAlb">Album</label>
+                    <div class="col-sm-3">
+                      <input type="text" class="form-control" ng-model="settings.iAlb" placeholder="Album Hash" autocapitalize="off">
+                    </div>
+                  </div>
+                </form>
+              </li>
+
               <li>
                 <form class="form-inline" role="form">
                   <div class="checkbox">