diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index d0a0e0d4f..f558a3839 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -11,164 +11,189 @@
 </div>
 
 <div class="container repo repo-admin" ng-show="!loading && repo && permissions">
-  <div class="header">
+  <div class="header row">
     <a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
     <h3>
       <span class="repo-circle no-background" repo="repo"></span> <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
     </h3>
-   </div>
+  </div>
   
-  <!-- User Access Permissions -->
-  <div class="panel panel-default">
-    <div class="panel-heading">User <span ng-show="repo.is_organization">and Team</span> Access Permissions
-
-      <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Allow any number of users or teams to read, write or administer this repository"></i>
+  <div class="row">
+    <!-- Side tabs -->
+    <div class="col-md-2">
+      <ul class="nav nav-pills nav-stacked">
+        <li class="active"><a href="javascript:void(0)" data-toggle="tab" data-target="#permissions">Permissions</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#publicprivate">Public/Private</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#delete">Delete Repo</a></li>
+      </ul>
     </div>
-    <div class="panel-body">
-        
-      <table class="permissions">
-        <thead>
-          <tr>
-            <td>User<span ng-show="repo.is_organization">/Team</span></td>
-            <td>Permissions</td>
-            <td style="width: 95px;"></td>
-          </tr>
-        </thead>
-        
-        <!-- Team Permissions -->
-        <tr ng-repeat="(name, permission) in permissions['team']">
-          <td class="team entity">
-            <i class="fa fa-group"></i> 
-            <span><a href="/organization/{{ repo.namespace }}/teams/{{ name }}">{{name}}</a></span>
-          </td>
-          <td class="user-permissions">
-            <span class="role-group" current-role="permission.role" role-changed="setRole(role, name, 'team')" roles="roles"></span>
-          </td>
-          <td>
-            <span class="delete-ui" tabindex="0">
-              <span class="delete-ui-button" ng-click="deleteRole(name, 'team')"><button class="btn btn-danger">Delete</button></span>
-              <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Permission"></i>
-            </span>
-          </td>
-        </tr>
-        
-        <!-- User Permissions -->
-        <tr ng-repeat="(name, permission) in permissions['user']">
-          <td class="{{ 'user entity ' + (permission.is_org_member? '' : 'outside') }}">
-            <i class="fa fa-user"></i> 
-            <span>{{name}}</span>
-            <i class="fa fa-exclamation-triangle" ng-show="permission.is_org_member === false" data-trigger="hover" bs-popover="{'content': 'This user is not a member of the organization'}"></i>
-          </td>
-          <td class="user-permissions">
-            <div class="btn-group btn-group-sm">
-              <span class="role-group" current-role="permission.role" role-changed="setRole(role, name, 'user')" roles="roles"></span>
+
+    <!-- Content -->
+    <div class="col-md-10">
+      
+      <div class="tab-content">       
+        <!-- Permissions tab -->
+        <div id="permissions" class="tab-pane active">
+          <!-- User Access Permissions -->
+          <div class="panel panel-default">
+            <div class="panel-heading">User <span ng-show="repo.is_organization">and Team</span> Access Permissions
+
+              <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Allow any number of users or teams to read, write or administer this repository"></i>
             </div>
-          </td>
-          <td>
-            <span class="delete-ui" tabindex="0" title="Delete Permission">
-              <span class="delete-ui-button" ng-click="deleteRole(name, 'user')"><button class="btn btn-danger">Delete</button></span>
-              <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Permission"></i>
-            </span>
-          </td>
-        </tr>
+            <div class="panel-body">
+              
+              <table class="permissions">
+                <thead>
+                  <tr>
+                    <td>User<span ng-show="repo.is_organization">/Team</span></td>
+                    <td>Permissions</td>
+                    <td style="width: 95px;"></td>
+                  </tr>
+                </thead>
+                
+                <!-- Team Permissions -->
+                <tr ng-repeat="(name, permission) in permissions['team']">
+                  <td class="team entity">
+                    <i class="fa fa-group"></i> 
+                    <span><a href="/organization/{{ repo.namespace }}/teams/{{ name }}">{{name}}</a></span>
+                  </td>
+                  <td class="user-permissions">
+                    <span class="role-group" current-role="permission.role" role-changed="setRole(role, name, 'team')" roles="roles"></span>
+                  </td>
+                  <td>
+                    <span class="delete-ui" tabindex="0">
+                      <span class="delete-ui-button" ng-click="deleteRole(name, 'team')"><button class="btn btn-danger">Delete</button></span>
+                      <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Permission"></i>
+                    </span>
+                  </td>
+                </tr>
+                
+                <!-- User Permissions -->
+                <tr ng-repeat="(name, permission) in permissions['user']">
+                  <td class="{{ 'user entity ' + (permission.is_org_member? '' : 'outside') }}">
+                    <i class="fa fa-user"></i> 
+                    <span>{{name}}</span>
+                    <i class="fa fa-exclamation-triangle" ng-show="permission.is_org_member === false" data-trigger="hover" bs-popover="{'content': 'This user is not a member of the organization'}"></i>
+                  </td>
+                  <td class="user-permissions">
+                    <div class="btn-group btn-group-sm">
+                      <span class="role-group" current-role="permission.role" role-changed="setRole(role, name, 'user')" roles="roles"></span>
+                    </div>
+                  </td>
+                  <td>
+                    <span class="delete-ui" tabindex="0" title="Delete Permission">
+                      <span class="delete-ui-button" ng-click="deleteRole(name, 'user')"><button class="btn btn-danger">Delete</button></span>
+                      <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Permission"></i>
+                    </span>
+                  </td>
+                </tr>
 
-        <tr>
-          <td colspan="2">
-            <span class="entity-search" organization="repo.namespace" input-title="'Add a ' + (repo.is_organization ? 'team or ' : '') + 'user...'" entity-selected="addNewPermission"></span>
-          </td>
-        </tr>
-      </table>
-    </div>
-  </div>
+                <tr>
+                  <td colspan="2">
+                    <span class="entity-search" organization="repo.namespace" input-title="'Add a ' + (repo.is_organization ? 'team or ' : '') + 'user...'" entity-selected="addNewPermission"></span>
+                  </td>
+                </tr>
+              </table>
+            </div>
+          </div>
 
-  <!-- Token Permissions -->
-  <div class="panel panel-default">
-    <div class="panel-heading">Access Token Permissions
+          <!-- Token Permissions -->
+          <div class="panel panel-default">
+            <div class="panel-heading">Access Token Permissions
 
-      <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Grant permissions to this repository by creating unique tokens that can be used without entering account passwords<br><br>To use in docker:<br><dl class='dl-horizontal'><dt>Username</dt><dd>$token</dd><dt>Password</dt><dd>(token value)</dd><dt>Email</dt><dd>(any value)</dd></dl>"></i>
-    </div>
-    <div class="panel-body">
-      <form name="createTokenForm" ng-submit="createToken()">
-        <table class="permissions">
-          <thead>
-            <tr>
-              <td>Token Description</td>
-              <td>Permissions</td>
-              <td></td>
-            </tr>
-          </thead>
-          
-          <tr ng-repeat="(code, token) in tokens">
-            <td class="user token">
-              <i class="fa fa-key"></i> 
-              <a ng-click="showToken(token.code)">{{ token.friendlyName }}</a>
-            </td>
-            <td class="user-permissions">
-              <div class="btn-group btn-group-sm">
-                <button type="button" class="btn btn-default" ng-click="changeTokenAccess(token.code, 'read')" ng-class="{read: 'active', write: ''}[token.role]">Read only</button>
-                <button type="button" class="btn btn-default" ng-click="changeTokenAccess(token.code, 'write')" ng-class="{read: '', write: 'active'}[token.role]">Write</button>
+              <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Grant permissions to this repository by creating unique tokens that can be used without entering account passwords<br><br>To use in docker:<br><dl class='dl-horizontal'><dt>Username</dt><dd>$token</dd><dt>Password</dt><dd>(token value)</dd><dt>Email</dt><dd>(any value)</dd></dl>"></i>
+            </div>
+            <div class="panel-body">
+              <form name="createTokenForm" ng-submit="createToken()">
+                <table class="permissions">
+                  <thead>
+                    <tr>
+                      <td>Token Description</td>
+                      <td>Permissions</td>
+                      <td></td>
+                    </tr>
+                  </thead>
+                  
+                  <tr ng-repeat="(code, token) in tokens">
+                    <td class="user token">
+                      <i class="fa fa-key"></i> 
+                      <a ng-click="showToken(token.code)">{{ token.friendlyName }}</a>
+                    </td>
+                    <td class="user-permissions">
+                      <div class="btn-group btn-group-sm">
+                        <button type="button" class="btn btn-default" ng-click="changeTokenAccess(token.code, 'read')" ng-class="{read: 'active', write: ''}[token.role]">Read only</button>
+                        <button type="button" class="btn btn-default" ng-click="changeTokenAccess(token.code, 'write')" ng-class="{read: '', write: 'active'}[token.role]">Write</button>
+                      </div>
+                    </td>
+                    <td>
+                      <span class="delete-ui" tabindex="0">
+                        <span class="delete-ui-button" ng-click="deleteToken(token.code)"><button class="btn btn-danger" type="button">Delete</button></span>
+                        <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Token"></i>
+                      </span>
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <td>
+                      <input type="text" class="form-control" placeholder="New token description" ng-model="newToken.friendlyName"required>
+                    </td>
+                    <td>
+                      <button type="submit" ng-disabled="createTokenForm.$invalid" class="btn btn-sm btn-default">Create</button>
+                    </td>
+                  </tr>
+                </table>
+              </form>
+            </div>
+          </div>
+
+        </div>
+
+        <!-- Public/private tab -->
+        <div id="publicprivate" class="tab-pane">         
+          <!-- Public/Private -->
+          <div class="panel panel-default">
+            <div class="panel-body">
+              <div class="repo-access-state" ng-show="!repo.is_public">
+                <div class="state-icon"><i class="fa fa-lock"></i></div>
+
+                This repository is currently <b>private</b>. Only users on the above access list may view and interact with it.
+
+                <div class="change-access">
+                  <button class="btn btn-danger" ng-click="askChangeAccess('public')">Make Public</button>
+                </div>
               </div>
-            </td>
-            <td>
-              <span class="delete-ui" tabindex="0">
-                <span class="delete-ui-button" ng-click="deleteToken(token.code)"><button class="btn btn-danger" type="button">Delete</button></span>
-                <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Token"></i>
-              </span>
-            </td>
-          </tr>
 
-          <tr>
-              <td>
-                <input type="text" class="form-control" placeholder="New token description" ng-model="newToken.friendlyName"required>
-              </td>
-              <td>
-                <button type="submit" ng-disabled="createTokenForm.$invalid" class="btn btn-sm btn-default">Create</button>
-              </td>
-          </tr>
-        </table>
-      </form>
-    </div>
-  </div>
+              <div class="repo-access-state" ng-show="repo.is_public">
+                <div class="state-icon"><i class="fa fa-unlock"></i></div>
 
-  <!-- Public/Private -->
-  <div class="panel panel-default">
-    <div class="panel-heading">Repository Settings</div>
-    <div class="panel-body">
-    <div class="repo-access-state" ng-show="!repo.is_public">
-    <div class="state-icon"><i class="fa fa-lock"></i></div>
+                This repository is currently <b>public</b> and is visible to all users, and may be pulled by all users.
 
-        This repository is currently <b>private</b>. Only users on the above access list may view and interact with it.
-
-        <div class="change-access">
-          <button class="btn btn-danger" ng-click="askChangeAccess('public')">Make Public</button>
+                <div class="change-access">
+                  <button class="btn btn-danger" ng-click="askChangeAccess('private')">Make Private</button>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
-      </div>
 
-      <div class="repo-access-state" ng-show="repo.is_public">
-        <div class="state-icon"><i class="fa fa-unlock"></i></div>
-
-        This repository is currently <b>public</b> and is visible to all users, and may be pulled by all users.
-
-        <div class="change-access">
-          <button class="btn btn-danger" ng-click="askChangeAccess('private')">Make Private</button>
+        <!-- Delete tab -->
+        <div id="delete" class="tab-pane">
+          <!-- Delete Repo -->
+          <div class="panel panel-default">
+            <div class="panel-body">
+              <div class="repo-delete">
+                <div class="alert alert-danger">Deleting a repository <b>cannot be undone</b>. Here be dragons!</div>
+                <button class="btn btn-danger" ng-click="askDelete()">Delete Repository</button>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </div>
-  <br>
 
-  <!-- Delete Repo -->
-  <div class="panel panel-default">
-    <div class="panel-heading">Delete Repository</div>
-    <div class="panel-body">
-      <div class="repo-delete">
-        <div class="alert alert-danger">Deleting a repository <b>cannot be undone</b>. Here be dragons!</div>
-        <button class="btn btn-danger" ng-click="askDelete()">Delete Repository</button>
-      </div>
-    </div>
-  </div>
 
- <!-- Modal message dialog -->
+  <!-- Modal message dialog -->
   <div class="modal fade" id="cannotchangeModal">
     <div class="modal-dialog">
       <div class="modal-content">
@@ -201,13 +226,13 @@
           </div>
         </div>
         <div class="modal-footer">
-           <span class="download-cfg" ng-show="isDownloadSupported()">
-             <i class="icon-download"></i>
-             <a href="javascript:void(0)" ng-click="downloadCfg(shownToken)">Download .dockercfg file</a>
-           </span>
-           <div id="clipboardCopied" style="display: none">
-                   Copied to clipboard
-           </div>
+          <span class="download-cfg" ng-show="isDownloadSupported()">
+            <i class="icon-download"></i>
+            <a href="javascript:void(0)" ng-click="downloadCfg(shownToken)">Download .dockercfg file</a>
+          </span>
+          <div id="clipboardCopied" style="display: none">
+            Copied to clipboard
+          </div>
           <button id="copyClipboard" type="button" class="btn btn-primary" data-clipboard-target="token-view">Copy to clipboard</button>
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
         </div>
@@ -216,7 +241,7 @@
   </div><!-- /.modal -->
   
 
- <!-- Modal message dialog -->
+  <!-- Modal message dialog -->
   <div class="modal fade" id="makepublicModal">
     <div class="modal-dialog">
       <div class="modal-content">
@@ -321,4 +346,3 @@
     </div><!-- /.modal-dialog -->
   </div><!-- /.modal -->
 
-</div>