diff --git a/assets/scripts/app/templates/repo/settings.hbs b/assets/scripts/app/templates/repo/settings.hbs
index eacaafc1..3143ec48 100644
--- a/assets/scripts/app/templates/repo/settings.hbs
+++ b/assets/scripts/app/templates/repo/settings.hbs
@@ -3,44 +3,30 @@
 
   {{#travis-tabs}}
     {{#travis-tab "general" "General Settings"}}
-      {{#settings-form class="settings-form"}}
-        <div class="settings-row">
-          <div class="short-settings-element">
-            {{travis-switch action="save" active=settings.builds_only_with_travis_yml}}
-          </div>
-          <label class="tipsy" title="Build only commits when a .travis.yml file is present in the git tree. Helps reduce builds when first setting up a project or when there are branches around the projects that don't need to be built.">
-            Build only if .travis.yml is present
-          </label>
-        </div>
+      {{#settings-form}}
+        <p class="settings-row">
+          Build only if .travis.yml is present
+          {{travis-switch action="save" active=settings.builds_only_with_travis_yml}}
+        </p>
 
-        <div class="settings-row">
-          <div class="short-settings-element">
-            {{travis-switch action="save" active=settings.build_pushes}}
-          </div>
-          <label class="tipsy" title="Build commits that are part of a branch.">
-            Build pushes
-          </label>
-        </div>
+        <p class="settings-row">
+          Build pushes
+          {{travis-switch action="save" active=settings.build_pushes}}
+        </p>
 
-        <div class="settings-row">
+        <p class="settings-row">
+          Build pull requests
+          {{travis-switch action="save" active=settings.build_pull_requests}}
+        </p>
 
-          <div class="short-settings-element">
-            {{travis-switch action="save" active=settings.build_pull_requests}}
-          </div>
-
-          <label>
-            Build pull requests
-          </label>
-        </div>
-
-        <div class="settings-row">
-          <div class="short-settings-element" {{bind-attr class="settings.maximum_number_of_builds_valid"}}>
+        <p class="settings-row">
+          <p class="short-settings-element" {{bind-attr class="settings.maximum_number_of_builds_valid"}}>
             {{input value=settings.maximum_number_of_builds size="4" pattern='/^[0-9]+$/'}}
-          </div>
+          </p>
           <label>
             Concurrent builds
           </label>
-        </div>
+        </p>
       {{/settings-form}}
     {{/travis-tab}}
   {{/travis-tabs}}
diff --git a/assets/styles/settings.sass b/assets/styles/settings.sass
index 5e5170c0..331af6c9 100644
--- a/assets/styles/settings.sass
+++ b/assets/styles/settings.sass
@@ -1,25 +1,29 @@
-.settings-form
-  margin-top: 30px
+form
+  margin: 20px
+  display: inline-block
 
-  .settings-row
-    display: table
-    height: 20px
-
-    label
-      font-size: 13px
-      height: 20px
-      line-height: 25px
-      padding: 0
-
-  .short-settings-element
-    display: table-cell
+  p.short-settings-element
+    display: inline-block
     vertical-align: middle
-    text-align: right
-    width: 100px
+    margin: 0 10px 0 0
+    float: left
+
+  label
+    line-height: 30px
 
   input
-    margin: 0px 15px
     display: inline-block
+    float: left
+    width: 60px
+    height: 18px
+    padding: 5px 18px 5px 18px
+    background-color: #F5F5F5
+    border: 1px solid #E3E1E1
+    border-radius: 4px
+    line-height: 19px
+    font-size: 11px
+    color: #999999
+    text-align: center
     
   .invalid
     input