diff --git a/static/directives/namespace-selector.html b/static/directives/namespace-selector.html
index de208f7c7..bc8abc9a2 100644
--- a/static/directives/namespace-selector.html
+++ b/static/directives/namespace-selector.html
@@ -1,5 +1,8 @@
 <span class="namespace-selector-dropdown">
-  <span ng-show="user.organizations.length == 0">{{user.username}}</span>
+  <span ng-show="user.organizations.length == 0">
+    <img src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=24&d=identicon" />
+    <span class="namespace-name">{{user.username}}</span>
+  </span>
 
   <div class="btn-group" ng-show="user.organizations.length > 0">
   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 87b6bd220..78e1a3650 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -143,38 +143,61 @@ function GuideCtrl($scope) {
 }
 
 function RepoListCtrl($scope, Restangular, UserService) {
+  $scope.namespace = null;
+
   $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
     $scope.user = currentUser;
   }, true);
 
+  $scope.$watch('namespace', function(namespace) {
+    loadMyRepos(namespace);
+  });
+
   $scope.loading = true;
   $scope.public_repositories = null;
-  $scope.private_repositories = null;
+  $scope.user_repositories = null;
 
-  // Load the list of personal repositories.
-  var repositoryPrivateFetch = Restangular.all('repository/');
-  repositoryPrivateFetch.getList({'public': false, 'sort': true}).then(function(resp) {
-    $scope.private_repositories = resp.repositories;
-    $scope.loading = !($scope.public_repositories && $scope.private_repositories);
-  });
+   var loadMyRepos = function(namespace) {
+    if (!$scope.user || $scope.user.anonymous || !namespace) {
+      return;
+    }
+
+    $scope.loadingmyrepos = true;
+
+    // Load the list of repositories.
+    var params = {
+      'limit': 10,
+      'public': true,
+      'sort': true,
+      'namespace': namespace
+    };
+
+    var repositoryFetch = Restangular.all('repository/');
+    repositoryFetch.getList(params).then(function(resp) {
+      $scope.user_repositories = resp.repositories;
+      $scope.loading = !($scope.public_repositories && $scope.user_repositories);
+    });
+  };
 
   // Load the list of public repositories.
   var options = {'public': true, 'private': false, 'sort': true, 'limit': 10};
   var repositoryPublicFetch = Restangular.all('repository/');
     repositoryPublicFetch.getList(options).then(function(resp) {
     $scope.public_repositories = resp.repositories;
-    $scope.loading = !($scope.public_repositories && $scope.private_repositories);
+    $scope.loading = !($scope.public_repositories && $scope.user_repositories);
   });
 }
 
 function LandingCtrl($scope, $timeout, $location, Restangular, UserService, KeyService) {
   $('.form-signup').popover();
 
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-    if (!currentUser.anonymous) {
-      $scope.loadMyRepos();
-    }
+  $scope.namespace = null;
 
+  $scope.$watch('namespace', function(namespace) {
+    loadMyRepos(namespace);
+  });
+
+  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
     $scope.user = currentUser;
   }, true);
 
@@ -207,18 +230,23 @@ function LandingCtrl($scope, $timeout, $location, Restangular, UserService, KeyS
     });
   };
 
-  $scope.loadMyRepos = function() {
-      $scope.loadingmyrepos = true;
+  var loadMyRepos = function(namespace) {
+    if (!$scope.user || $scope.user.anonymous || !namespace) {
+      return;
+    }
 
-      // Load the list of repositories.
-      var params = {
-          'limit': 5,
-          'public': false,
-          'sort': true
-      };
+    $scope.loadingmyrepos = true;
 
-      var repositoryFetch = Restangular.all('repository/');
-      repositoryFetch.getList(params).then(function(resp) {
+    // Load the list of repositories.
+    var params = {
+      'limit': 4,
+      'public': true,
+      'sort': true,
+      'namespace': namespace
+    };
+
+    var repositoryFetch = Restangular.all('repository/');
+    repositoryFetch.getList(params).then(function(resp) {
       $scope.myrepos = resp.repositories;
       $scope.loadingmyrepos = false;
     });
diff --git a/static/partials/landing.html b/static/partials/landing.html
index aadb8fadd..5c9962fd0 100644
--- a/static/partials/landing.html
+++ b/static/partials/landing.html
@@ -12,8 +12,9 @@
           <div ng-show="loadingmyrepos">
             <i class="fa fa-spinner fa-spin fa-3x"></i>
           </div>
+          <span class="namespace-selector" user="user" namespace="namespace" ng-show="!loadingmyrepos && user.organizations"></span>
           <div ng-show="!loadingmyrepos && myrepos.length > 0">
-            <h2>Your Top Repositories</h2>      
+            <h2>Top Repositories</h2>
             <div class="repo-listing" ng-repeat="repository in myrepos">
               <span class="repo-circle no-background" repo="repository"></span>
               <a ng-href="/repository/{{ repository.namespace }}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
@@ -21,13 +22,14 @@
             </div>
           </div>
           <div ng-show="!loadingmyrepos && myrepos.length == 0">
-            <div class="sub-message">
-              You don't have any <b>private</b> repositories yet!
+            <div class="sub-message" style="margin-top: 20px">
+              <span ng-show="namespace != user.username">This organization doesn't</span>
+              <span ng-show="namespace == user.username">You don't</span>
+              have any repositories yet!
 
               <div class="options">
-                <div class="option"><a href="/guide">Learn how to create a repository</a></div>
-                <div class="or"><span>or</span></div>
-                <div class="option"><a href="/repository">Browse the public repositories</a></div>
+                <a class="btn btn-primary" href="/repository/">Browse all repositories</a>
+                <a class="btn btn-success" href="/new/">Create a new repository</a>
               </div>
             </div>
           </div>
diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html
index 22ae0455d..94e381f08 100644
--- a/static/partials/repo-list.html
+++ b/static/partials/repo-list.html
@@ -11,18 +11,22 @@
       </button>
     </a>
 
-    <h3>Your Repositories</h3>
-    <div ng-show="private_repositories.length > 0">
-      <div class="repo-listing" ng-repeat="repository in private_repositories">
+    <span class="namespace-selector" user="user" namespace="namespace" ng-show="user.organizations"></span>
+    <h3 ng-show="namespace == user.username">Your Repositories</h3>
+    <h3 ng-show="namespace != user.username">Repositories</h3>
+    
+    <div ng-show="user_repositories.length > 0">
+      <div class="repo-listing" ng-repeat="repository in user_repositories">
         <span class="repo-circle no-background" repo="repository"></span>
         <a ng-href="/repository/{{repository.namespace}}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
         <div class="description markdown-view" content="repository.description" first-line-only="true"></div>
       </div>
     </div>
 
-    <div ng-show="private_repositories.length == 0" style="padding:20px;">
+    <div ng-show="user_repositories.length == 0" style="padding:20px;">
       <div class="alert alert-info">
-        <h4>You don't have any repositories yet!</h4>
+        <h4 ng-show="namespace == user.username">You don't have any repositories yet!</h4>
+        <h4 ng-show="namespace != user.username">This organization does not have any repositories yet!</h4>
         <a href="/guide"><b>Click here</b> to learn how to create a repository</a>
       </div>