diff --git a/endpoints/api.py b/endpoints/api.py
index c5592d8b8..853c7498f 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -191,6 +191,8 @@ def create_repo_api():
 
   repo = model.create_repository(namespace_name, repository_name, owner,
                                  visibility)
+  repo.description = request.get_json()['description']
+  repo.save()
 
   return jsonify({
     'namespace': namespace_name,
diff --git a/static/js/controllers.js b/static/js/controllers.js
index a74f606a7..f3954c6a9 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -335,28 +335,69 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
     }
   });
 
+  var fetchRepository = function() {
+    var repositoryFetch = Restangular.one('repository/' + namespace + '/' + name);
+    repositoryFetch.get().then(function(repo) {
+      $rootScope.title = namespace + '/' + name;
+      $scope.repo = repo;
+
+      $scope.setTag($routeParams.tag);
+
+      $('#copyClipboard').clipboardCopy();
+      $scope.loading = false;
+
+      if (repo.is_building) {
+        startBuildInfoTimer(repo);
+      }  
+    }, function() {
+      $scope.repo = null;
+      $scope.loading = false;
+      $rootScope.title = 'Unknown Repository';
+    });
+  };
+
   var startBuildInfoTimer = function(repo) {
     if ($scope.interval) { return; }
 
     getBuildInfo(repo);
     $scope.interval = setInterval(function() {
-      var container = document.getElementById('build-status-container');
-      if (container != null && container.offsetWidth > 0) {            
-        $scope.$apply(function() { getBuildInfo(repo); });
-      }
-    }, 2000);
+      $scope.$apply(function() { getBuildInfo(repo); });
+    }, 5000);
 
     $scope.$on("$destroy", function() {
-      if ($scope.interval) {
-        clearInterval($scope.interval);
-      }
+      cancelBuildInfoTimer();
     });
   };
 
+  var cancelBuildInfoTimer = function() {
+    if ($scope.interval) {
+      clearInterval($scope.interval);
+    }
+  };
+
   var getBuildInfo = function(repo) {
     var buildInfo = Restangular.one('repository/' + repo.namespace + '/' + repo.name + '/build/');
     buildInfo.get().then(function(resp) {
-      $scope.buildsInfo = resp.builds;
+      var runningBuilds = [];
+      for (var i = 0; i < resp.builds.length; ++i) {
+        var build = resp.builds[i];
+        if (build.status != 'complete') {
+          runningBuilds.push(build);
+        }
+      }
+
+      $scope.buildsInfo = runningBuilds;
+      if (!runningBuilds.length) {
+        // Cancel the build timer.
+        cancelBuildInfoTimer();
+
+        // Mark the repo as no longer building.
+        $scope.repo.is_building = false;
+
+        // Reload the repo information.
+        fetchRepository();
+        listImages();
+      }
     });
   };
 
@@ -455,24 +496,7 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
   $scope.loading = true;
 
   // Fetch the repo.
-  var repositoryFetch = Restangular.one('repository/' + namespace + '/' + name);
-  repositoryFetch.get().then(function(repo) {
-    $rootScope.title = namespace + '/' + name;
-    $scope.repo = repo;
-
-    $scope.setTag($routeParams.tag);
-
-    $('#copyClipboard').clipboardCopy();
-    $scope.loading = false;
-
-    if (repo.is_building) {
-      startBuildInfoTimer(repo);
-    }  
-  }, function() {
-    $scope.repo = null;
-    $scope.loading = false;
-    $rootScope.title = 'Unknown Repository';
-  });
+  fetchRepository();
 
   // Fetch the image history.
   listImages();
@@ -1028,7 +1052,8 @@ function NewRepoCtrl($scope, $location, $http, UserService, Restangular, PlanSer
     var repo = $scope.repo;
     var data = {
       'repository': repo.name,
-      'visibility': repo.is_public == '1' ? 'public' : 'private'
+      'visibility': repo.is_public == '1' ? 'public' : 'private',
+      'description': repo.description
     };
 
     var createPost = Restangular.one('repository');
diff --git a/static/partials/build-status-item.html b/static/partials/build-status-item.html
index a85af075d..be1c06878 100644
--- a/static/partials/build-status-item.html
+++ b/static/partials/build-status-item.html
@@ -2,4 +2,8 @@
  <div ng-repeat="build in buildsInfo">
    <div class="build-status" build="build"></div>
  </div>
+
+ <div ng-show="buildsInfo.length == 0">
+   All Dockerfile builds complete
+ </div>
 </div>
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html
index b2293d2e4..77a574b5a 100644
--- a/static/partials/view-repo.html
+++ b/static/partials/view-repo.html
@@ -64,6 +64,10 @@
     <div class="empty-message">(This repository is empty)</div>
   </div>
 
+  <div class="repo-content" ng-show="!currentTag.image && repo.is_building">
+    <div class="empty-message">Your build is currently processing, if this takes longer than an hour, please contact quay support</div>
+  </div>
+
   <!-- Content view -->
   <div class="repo-content" ng-show="currentTag.image">
     <!-- Image History -->