diff --git a/cmd/drone-server/drone-server b/cmd/drone-server/drone-server
new file mode 100755
index 00000000..abd4d8bd
Binary files /dev/null and b/cmd/drone-server/drone-server differ
diff --git a/cmd/drone-server/static/scripts/controllers/builds.js b/cmd/drone-server/static/scripts/controllers/builds.js
index d37ad76c..974b14be 100644
--- a/cmd/drone-server/static/scripts/controllers/builds.js
+++ b/cmd/drone-server/static/scripts/controllers/builds.js
@@ -98,7 +98,6 @@
     });
 
     $scope.restart = function () {
-      console.log('restart');
       builds.restart(fullName, number).then(function (payload) {
         $scope.build = payload.data;
       }).catch(function (err) {
@@ -191,8 +190,26 @@
       $scope.error = err;
     });
 
+    repos.subscribe(fullName, function (event) {
+      if (event.number !== parseInt(number)) {
+        return; // ignore
+      }
+      // update the build
+      $scope.build = event;
+      console.log(event.builds);
+      $scope.task = event.builds[step - 1];
+      $scope.$apply();
+
+      // start streaming the current build
+      if ($scope.task.status === 'running') {
+        stream();
+      } else {
+        // resets our streaming state
+        streaming = false;
+      }
+    });
+
     $scope.restart = function () {
-      console.log('restart');
       builds.restart(fullName, number).then(function (payload) {
         $scope.build = payload.data;
         $scope.task = payload.data.builds[step - 1];
@@ -213,24 +230,6 @@
     $scope.tail = function () {
       tail = !tail;
     };
-
-    repos.subscribe(fullName, function (event) {
-      if (event.number !== parseInt(number)) {
-        return; // ignore
-      }
-      // update the build
-      $scope.build = event;
-      $scope.task = event.builds[step - 1];
-      $scope.$apply();
-
-      // start streaming the current build
-      if ($scope.task.status === 'running') {
-        stream();
-      } else {
-        // resets our streaming state
-        streaming = false;
-      }
-    });
   }
 
   angular
diff --git a/cmd/drone-server/static/scripts/drone.js b/cmd/drone-server/static/scripts/drone.js
index cf8e8c58..b3e98dd4 100644
--- a/cmd/drone-server/static/scripts/drone.js
+++ b/cmd/drone-server/static/scripts/drone.js
@@ -188,7 +188,7 @@
         },
         title: 'Build'
       })
-      .state('app.build_step', {
+      .state('app.job', {
         url: '/:owner/:name/:number/:step',
         views: {
           'toolbar': {
@@ -200,7 +200,8 @@
             templateUrl: '/static/scripts/views/builds/step/content.html',
             controller: 'BuildOutCtrl',
             resolve: resolveUser
-          }
+          },
+          title: 'Build Job'
         }
       });
 
diff --git a/cmd/drone-server/static/scripts/views/builds/index/content.html b/cmd/drone-server/static/scripts/views/builds/index/content.html
index e55d239c..cb113cdf 100644
--- a/cmd/drone-server/static/scripts/views/builds/index/content.html
+++ b/cmd/drone-server/static/scripts/views/builds/index/content.html
@@ -1,15 +1,15 @@
 <article>
   <section>
-    <a class="row build-row" ng-repeat="build in builds | orderBy:'-number'"
-       ng-href="/{{ repo.full_name }}/{{ build.number }}">
+    <a class="row build-row" ng-repeat="build in builds | orderBy:'-number'" ng-href="/{{ repo.full_name }}/{{ build.number }}">
       <div>
         <div ng-class="[ 'build-num', build.status ]"></div>
       </div>
       <div>
         <h3>{{ build.head_commit.message }}</h3>
 
-        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch
-          }}</strong> {{ build.started_at | fromNow }}</p>
+        <p>
+          <strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch}}</strong> {{ build.started_at | fromNow }}
+        </p>
 
         <div style="position:absolute;top:30px;right:30px;color:#CCC;"># {{build.number}}</div>
       </div>
diff --git a/cmd/drone-server/static/scripts/views/builds/show/content.html b/cmd/drone-server/static/scripts/views/builds/show/content.html
index d81b832f..fa7d9446 100644
--- a/cmd/drone-server/static/scripts/views/builds/show/content.html
+++ b/cmd/drone-server/static/scripts/views/builds/show/content.html
@@ -8,25 +8,25 @@
       <div>
         <h3>{{ build.head_commit.message }}</h3>
 
-        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch
-          }}</strong> {{ build.started_at | fromNow }}</p>
+        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch}}</strong> {{ build.started_at | fromNow }}</p>
 
         <div style="position:absolute;top:30px;right:30px;color:#CCC;"># {{build.number}}</div>
       </div>
     </div>
   </section>
-
+  <p style="padding-top: 20px;">
+    <h3><strong>Build jobs</strong></h3>
+  </p>
   <section>
-    <a class="row build-row sub-build-row" ng-repeat="job in build.jobs"
-       ng-href="{{ repo.full_name }}/{{ build.number }}/{{ job.number }}">
+    <a class="row build-row sub-build-row" ng-repeat="job in build.jobs" ng-href="{{ repo.full_name }}/{{ build.number }}/{{ job.number }}">
       <div>
         <div ng-class="[ 'build-num', build.status ]"></div>
       </div>
       <div>
         <h3>
           <div ng-repeat="(key, value) in job.environment">
-            {{ key.toUpperCase() }}={{ value }}
-          </div>
+          {{ key.toUpperCase() }}={{ value }}
+        </div>
         </h3>
         <div style="position:absolute;top:30px;right:30px;color:#CCC;"># {{job.number}}</div>
       </div>
@@ -34,6 +34,7 @@
   </section>
 </article>
 
-
-<button ng-if="build.status !== 'pending' && build.status !== 'running'" ng-click="restart()">Restart</button>
-<button ng-if="build.status === 'pending' || build.status === 'running'" ng-click="cancel()">Cancel</button>
\ No newline at end of file
+<div style="padding-left: 20px;">
+  <button ng-if="build.status !== 'pending' && build.status !== 'running'" ng-click="restart()">Restart</button>
+  <button ng-if="build.status === 'pending' || build.status === 'running'" ng-click="cancel()">Cancel</button>
+</div>
diff --git a/cmd/drone-server/static/scripts/views/builds/step/content.html b/cmd/drone-server/static/scripts/views/builds/step/content.html
index 40351b42..3c3a578f 100644
--- a/cmd/drone-server/static/scripts/views/builds/step/content.html
+++ b/cmd/drone-server/static/scripts/views/builds/step/content.html
@@ -9,8 +9,7 @@
       <div>
         <h3>{{ build.head_commit.message }}</h3>
 
-        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch
-          }}</strong> {{ build.started_at | fromNow }}</p>
+        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch}}</strong> {{ build.started_at | fromNow }}</p>
       </div>
     </div>
 
diff --git a/cmd/drone-server/static/scripts/views/builds/step/toolbar.html b/cmd/drone-server/static/scripts/views/builds/step/toolbar.html
index 37018ff5..8fc3302c 100644
--- a/cmd/drone-server/static/scripts/views/builds/step/toolbar.html
+++ b/cmd/drone-server/static/scripts/views/builds/step/toolbar.html
@@ -3,10 +3,10 @@
     <i class="material-icons md-18">home</i>
   </a>
   <a ng-href="/{{ repo.full_name }}">{{ repo.owner }} / {{ repo.name }}</a>
+  <span class="spacer">&nbsp;</span>
+  <a ng-href="/{{ repo.full_name }}/{{ build.number }}">Build # {{ build.number }}</a>
   <span class="spacer"></span>
-  <a ng-href="/{{ repo.full_name }}/{{ build.sequence }}">{{ build.sequence }}</a>
-  <span class="spacer"></span>
-  <a href="#">{{ task.sequence }}</a>
+  <a href="#">Job #{{ task.number }}</a>
 </div>
 
 <div class="menu">