diff --git a/app/controllers/settings.coffee b/app/controllers/settings.coffee
index 2b2ff314..c96cc4cc 100644
--- a/app/controllers/settings.coffee
+++ b/app/controllers/settings.coffee
@@ -10,4 +10,9 @@ SettingsController = Ember.Controller.extend
     sshKeyDeleted: ->
       @set('model.customSshKey', null)
 
+    deactivate: ->
+      console.log('deactivate')
+      debugger
+    
+
 `export default SettingsController`
diff --git a/app/styles/app/layouts/build-job.sass b/app/styles/app/layouts/build-job.sass
index 3926191f..3e8c6886 100644
--- a/app/styles/app/layouts/build-job.sass
+++ b/app/styles/app/layouts/build-job.sass
@@ -68,7 +68,7 @@
       overflow: hidden
     .job-id
       width: grid-calc(3, 24)
-      border-right: solid 1px $grey-lighter
+      border-right: solid 1px $cream-dark
     .job-os
       width: grid-calc(1, 24)
       text-align: center
diff --git a/app/styles/app/modules/tooltips.sass b/app/styles/app/modules/tooltips.sass
index 9f917e65..b56331c9 100644
--- a/app/styles/app/modules/tooltips.sass
+++ b/app/styles/app/modules/tooltips.sass
@@ -1,6 +1,5 @@
 %tooltip
-  &:hover .tooltip-bubble, 
-  &:hover + .tooltip-bubble
+  &:hover .tooltip-bubble
     transform: translateY(0)
     opacity: 1
 
@@ -8,7 +7,6 @@
     position: absolute
     top: -3.2em
     width: auto
-    max-width: 8.6em
     height: 1.9em
     margin: auto
     padding: .2em .4em .3em
@@ -23,6 +21,11 @@
     transform: translateY(20%)
     opacity: 0
 
+    a
+      color: $white
+      &:hover
+        text-decoration: underline
+
     &:before
       content: ""
       position: absolute
@@ -38,6 +41,7 @@
   .tooltip-bubble
     right: 0
     left: 0
+    max-width: 8.6em
     &:before
       left: 46%
       @media #{$medium-up}
@@ -50,6 +54,7 @@
     left: 0
     top: -4em
     height: 3.2em
+    max-width: 8.6em
     &:before
       left: 46%
       @media #{$medium-up}
@@ -61,7 +66,21 @@
   position: relative
   .tooltip-bubble
     top: -4.5em
-    left: -2em
+    left: -1.9em
     height: 3.7em
     &:before
       left: 15%
+
+.tooltip--settings
+  @extend %tooltip
+  display: inline-block
+  position: relative
+  .icon
+    width: 1.2em
+    height: 1.2em
+    vertical-align: middle
+  .tooltip-bubble
+    top: -2.6em
+    left: -1.9em
+    &:before
+      left: 2em
diff --git a/app/templates/components/limit-concurrent-builds.hbs b/app/templates/components/limit-concurrent-builds.hbs
index 21f60ea5..3132554f 100644
--- a/app/templates/components/limit-concurrent-builds.hbs
+++ b/app/templates/components/limit-concurrent-builds.hbs
@@ -1,4 +1,10 @@
 {{travis-switch active=enabled description=description action="toggle"}}
+<div class="tooltip--settings">
+  <a href="http://blog.travis-ci.com/2014-07-18-per-repository-concurrency-setting/" title="about the concurrency setting">
+    <p class="tooltip-bubble">Read more about concurrent builds</p>
+    <span class="icon icon--question"></span>
+  </a>
+</div>
 {{#if enabled}}
   {{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}}
 {{/if}}
diff --git a/app/templates/settings.hbs b/app/templates/settings.hbs
index f7b5373a..de7299f0 100644
--- a/app/templates/settings.hbs
+++ b/app/templates/settings.hbs
@@ -41,7 +41,7 @@
   <section class="settings-section">
     <h2 class="small-title">Deactivate Repository</h2>
     <p>If you'd no longer like to run this project on Travis CI you can deactivate it now.<br>You will be able to reactivate it in the future if you'd like to.</p>
-    <a href="#" class="button--delete">Deactivate Repository</a>
+    <a href="#" class="button--delete" {{action "deactivate"}}>Deactivate Repository</a>
   </section>
 
 </div>