diff --git a/app/assets/javascripts/app/views/maintenance.jst.eco b/app/assets/javascripts/app/views/maintenance.jst.eco
index 9eef2f1f2..e9ee7f9ce 100644
--- a/app/assets/javascripts/app/views/maintenance.jst.eco
+++ b/app/assets/javascripts/app/views/maintenance.jst.eco
@@ -1,29 +1,21 @@
-<div class="flex scrollable">
-  <div>
-    <div class="page-header-title">
-    <h1><%- @T('Maintenance Message') %><small></small></h1>
+<div class="page-header-title">
+  <h1><%- @T('Maintenance Message') %><small></small></h1>
+</div>
+<form id="maintenanceForm">
+  <div class="form-group">
+    <label for="maintenance-title"><%- @T('Title') %></label>
+    <div class="controls">
+      <input type="text" id="maintenance-title" name="head" class="form-control" required>
+    </div>
   </div>
-  <form id="maintenanceForm">
-    <fieldset>
-    <div class="form-group">
-      <label for="title"><%- @T('Title') %></label>
-      <div class="controls">
-        <input type="text" name="head" class="form-control" placeholder="<%- @Ti('some title') %>" required>
-      </div>
+  <div class="form-group">
+    <label for="maintenance-message"><%- @T('Message') %></label>
+    <div class="controls">
+    <textarea id="maintenance-message" name="message" class="form-control" rows="8"required></textarea>
     </div>
-    <div class="form-group">
-      <label for="message"><%- @T('Message') %></label>
-      <div class="controls">
-      <textarea name="message" class="form-control" rows="8" placeholder="<%- @Ti('what details') %>" required></textarea>
-      </div>
-    </div>
-    <div class="form-group">
-      <label for="message"><%- @T('Reload application') %></label>
-      <div class="controls">
-      <input name="reload" type="checkbox" value="1">
-      </div>
-    </div>
-    </fieldset>
-    <button type="submit" class="btn btn--primary submit"><%- @T('Send to clients') %></button>
-  </form>
-</div>
\ No newline at end of file
+  </div>
+  <div class="form-group">
+    <label><input name="reload" type="checkbox" value="1"> <%- @T('Reload application') %></label>
+  </div>
+  <button type="submit" class="btn btn--primary submit"><%- @T('Send to clients') %></button>
+</form>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco
index 53c8741f9..f2721019c 100644
--- a/app/assets/javascripts/app/views/package.jst.eco
+++ b/app/assets/javascripts/app/views/package.jst.eco
@@ -11,9 +11,9 @@
     </ul>
 -->
   <p>
-    <form action="<%= App.Config.get('api_path') %>/packages" method="post" enctype="multipart/form-data">
+    <form action="<%= App.Config.get('api_path') %>/packages" method="post" enctype="multipart/form-data" class="horizontal center">
       <input type="file" name="file_upload"/>
-      <button class="btn btn--primary" type="submit"><%- @T('Install Package') %></button>
+      <button class="align-right btn btn--primary" type="submit"><%- @T('Install Package') %></button>
     </form>
   </p>
 
diff --git a/app/assets/javascripts/app/views/settings/item.jst.eco b/app/assets/javascripts/app/views/settings/item.jst.eco
index 8a6cb30e8..7825d7d00 100644
--- a/app/assets/javascripts/app/views/settings/item.jst.eco
+++ b/app/assets/javascripts/app/views/settings/item.jst.eco
@@ -1,7 +1,8 @@
-<form class="" id="<%= @setting.name %>">
+<form class="settings-entry" id="<%= @setting.name %>">
   <h2><%- @T( @setting.title ) %></h2>
   <p><%- @T( @setting.description ) %></p>
-  <div class="form-item"></div>
-  <button type="submit" class="btn"><%- @T( 'Submit' ) %></button>
-</form>
-<hr/>
\ No newline at end of file
+  <div class="horizontal end">
+    <div class="form-item flex"></div>
+    <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
+  </div>
+</form>
\ No newline at end of file
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb
index 266dc92e2..6b94ad480 100644
--- a/app/assets/stylesheets/zzz.css.erb
+++ b/app/assets/stylesheets/zzz.css.erb
@@ -9,6 +9,11 @@ ol,
 ul {
 }
 
+p {
+  color: hsl(198,19%,72%);
+  margin-bottom: 14px;
+}
+
 a.create {
   color: hsl(145,51%,45%);
   text-decoration: underline;
@@ -547,6 +552,14 @@ textarea,
   margin-left: 10px;
 }
 
+.help-block {
+  margin: 0;
+}
+
+.help-block:not(:empty) {
+  margin: 5px 0 10px;
+}
+
 .help-block {
   color: #bcbcbc;
 }
@@ -3618,6 +3631,27 @@ footer {
   border-color: hsl(0,0%,90%);
 }
 
+.main .nav-tabs:first-child {
+  margin: 28px 0 50px;
+}
+
+.settings-entry {
+  margin-bottom: 42px;
+  max-width: 700px;
+}
+
+.form-item .form-group {
+  margin-bottom: 0;
+}
+
+.form-item .form-group + .form-group {
+  margin-top: 15px;
+}
+
+.form-item + .btn {
+  margin-left: 15px;
+}
+
 /*
 
   ----------------