diff --git a/src/app/app.js b/src/app/app.js
index 6d11648157..4f5366e094 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -15,7 +15,6 @@
         'bit.global',
         'bit.accounts',
         'bit.vault',
-        'bit.sharing',
         'bit.settings',
         'bit.tools',
         'bit.organization'
diff --git a/src/app/config.js b/src/app/config.js
index 684ac0d756..d368098c57 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -91,6 +91,12 @@ angular
                 controller: 'vaultController',
                 data: { pageTitle: 'My Vault' }
             })
+            .state('backend.user.subvaults', {
+                url: '^/subvaults',
+                templateUrl: 'app/vault/views/vaultSubvaults.html',
+                controller: 'vaultSubvaultsController',
+                data: { pageTitle: 'Subvaults' }
+            })
             .state('backend.user.settings', {
                 url: '^/settings',
                 templateUrl: 'app/settings/views/settings.html',
@@ -109,12 +115,6 @@ angular
                 controller: 'toolsController',
                 data: { pageTitle: 'Tools' }
             })
-            .state('backend.user.sharing', {
-                url: '^/sharing',
-                templateUrl: 'app/sharing/views/sharing.html',
-                controller: 'sharingController',
-                data: { pageTitle: 'Sharing Center' }
-            })
             .state('backend.org', {
                 templateUrl: 'app/views/organizationLayout.html',
                 abstract: true
diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js
index a08794e0cb..6f7085dac0 100644
--- a/src/app/organization/organizationPeopleController.js
+++ b/src/app/organization/organizationPeopleController.js
@@ -83,14 +83,42 @@
                 var users = [];
 
                 for (var i = 0; i < list.Data.length; i++) {
-                    users.push({
+                    var user = {
                         id: list.Data[i].Id,
                         userId: list.Data[i].UserId,
                         name: list.Data[i].Name,
                         email: list.Data[i].Email,
                         status: list.Data[i].Status,
                         type: list.Data[i].Type
-                    });
+                    };
+
+                    switch (user.type) {
+                        case 0:
+                            user.typeName = 'Owner';
+                            break;
+                        case 1:
+                            user.typeName = 'Admin';
+                            break;
+                        case 2:
+                        default:
+                            user.typeName = 'User';
+                            break;
+                    }
+
+                    switch (user.status) {
+                        case 0:
+                            user.statusName = 'Invited';
+                            break;
+                        case 1:
+                            user.statusName = 'Accepted';
+                            break;
+                        case 2:
+                        default:
+                            user.statusName = 'Confirmed';
+                            break;
+                    }
+
+                    users.push(user);
                 }
 
                 $scope.users = users;
diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html
index cedd2d3dd2..88e986658e 100644
--- a/src/app/organization/views/organizationPeople.html
+++ b/src/app/organization/views/organizationPeople.html
@@ -7,7 +7,7 @@
 <section class="content">
     <div class="box">
         <div class="box-header with-border">
-            <h3 class="box-title">Organization Users</h3>
+            <h3 class="box-title"></h3>
             <div class="box-tools">
                 <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="invite()">
                     Invite user
@@ -44,11 +44,11 @@
                                 <a href="javascript:void(0)" ng-click="edit(user.id)">{{user.email}}</a>
                                 <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
                             </td>
-                            <td style="width: 80px;" valign="middle">
-                                {{user.type}}
+                            <td style="width: 100px;" valign="middle">
+                                {{user.typeName}}
                             </td>
-                            <td style="width: 80px;" valign="middle">
-                                {{user.status}}
+                            <td style="width: 100px;" valign="middle">
+                                {{user.statusName}}
                             </td>
                         </tr>
                     </tbody>
diff --git a/src/app/organization/views/organizationSubvaults.html b/src/app/organization/views/organizationSubvaults.html
index d5584ae3e9..cd77a160f8 100644
--- a/src/app/organization/views/organizationSubvaults.html
+++ b/src/app/organization/views/organizationSubvaults.html
@@ -7,7 +7,9 @@
 <section class="content">
     <div class="box">
         <div class="box-header with-border">
-            <h3 class="box-title">Subvaults</h3>
+            <h3 class="box-title">
+
+            </h3>
             <div class="box-tools">
                 <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="add()">
                     New Subvault
@@ -26,22 +28,10 @@
                 <table class="table table-striped table-hover">
                     <tbody>
                         <tr ng-repeat="subvault in subvaults | orderBy: ['name']">
-                            <td style="width: 70px;" valign="middle">
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                        <i class="fa fa-cog"></i> <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        <li>
-                                            <a href="javascript:void(0)" ng-click="delete(subvault)" class="text-danger">
-                                                Delete
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </td>
                             <td valign="middle">
-                                {{subvault.name}}
+                                <a href="javascript:void(0)" ng-click="edit(subvault)">
+                                    {{subvault.name}}
+                                </a>
                             </td>
                         </tr>
                     </tbody>
diff --git a/src/app/sharing/sharingModule.js b/src/app/sharing/sharingModule.js
deleted file mode 100644
index 7bf6be525f..0000000000
--- a/src/app/sharing/sharingModule.js
+++ /dev/null
@@ -1,2 +0,0 @@
-angular
-    .module('bit.sharing', ['ui.bootstrap', 'ngclipboard']);
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index 72889b8406..aa86ce5027 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -178,7 +178,6 @@
                 animation: true,
                 templateUrl: 'app/vault/views/vaultShare.html',
                 controller: 'vaultShareController',
-                size: 'sm',
                 resolve: {
                     loginId: function () { return login.id; }
                 }
diff --git a/src/app/sharing/sharingController.js b/src/app/vault/vaultSubvaultsController.js
similarity index 91%
rename from src/app/sharing/sharingController.js
rename to src/app/vault/vaultSubvaultsController.js
index f9ebaf6d8f..f425c4917b 100644
--- a/src/app/sharing/sharingController.js
+++ b/src/app/vault/vaultSubvaultsController.js
@@ -1,7 +1,7 @@
 angular
-    .module('bit.sharing')
+    .module('bit.vault')
 
-    .controller('sharingController', function ($scope, apiService, cipherService, $analytics, $q) {
+    .controller('vaultSubvaultsController', function ($scope, apiService, cipherService, $analytics, $q) {
         $scope.logins = [];
         $scope.subvaults = [];
         $scope.loading = true;
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index b122274b74..f57fdbac9e 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -47,7 +47,7 @@
                 <table class="table table-striped table-hover table-selectable">
                     <thead>
                         <tr>
-                            <th style="width: 110px; min-width: 110px;"></th>
+                            <th style="width: 75px; min-width: 75px;"></th>
                             <th>Name</th>
                             <th style="width: 300px;">Username</th>
                         </tr>
@@ -60,10 +60,6 @@
                                         uib-tooltip="Delete">
                                     <i class="fa fa-lg fa-trash"></i>
                                 </button>
-                                <button type="button" ng-click="editLogin(login)" class="btn btn-link btn-table"
-                                        uib-tooltip="View/Edit">
-                                    <i class="fa fa-lg fa-pencil"></i>
-                                </button>
                                 <button type="button" ng-click="share(login)" class="btn btn-link btn-table"
                                         uib-tooltip="Share">
                                     <i class="fa fa-lg fa-share-alt"></i>
@@ -71,7 +67,7 @@
                             </td>
                             <td ng-click="editLogin(login)">
                                 <span ng-click="$event.stopPropagation()">
-                                    {{login.name}}
+                                    <a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
                                     <i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
                                 </span>
                             </td>
diff --git a/src/app/sharing/views/sharing.html b/src/app/vault/views/vaultSubvaults.html
similarity index 99%
rename from src/app/sharing/views/sharing.html
rename to src/app/vault/views/vaultSubvaults.html
index 53517647f0..30b8efd9a3 100644
--- a/src/app/sharing/views/sharing.html
+++ b/src/app/vault/views/vaultSubvaults.html
@@ -1,6 +1,6 @@
 <section class="content-header">
     <h1>
-        Sharing Center
+        Subvaults
         <small>{{subvaults.length}} subvaults, {{logins.length}} logins</small>
     </h1>
 </section>
diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html
index 8492518ab8..d2d42cc8f0 100644
--- a/src/app/views/userLayout.html
+++ b/src/app/views/userLayout.html
@@ -55,8 +55,8 @@
                     </li>
                 </ul>
             </li>
-            <li class="treeview" ng-class="{active: $state.is('backend.user.sharing')}">
-                <a ui-sref="backend.user.sharing"><i class="fa fa-share-alt fa-fw"></i> <span>Sharing Center</span></a>
+            <li class="treeview" ng-class="{active: $state.is('backend.user.subvaults')}">
+                <a ui-sref="backend.user.subvaults"><i class="fa fa-share-alt fa-fw"></i> <span>Subvaults</span></a>
             </li>
             <li class="treeview" ng-class="{active: $state.is('backend.user.tools')}">
                 <a ui-sref="backend.user.tools"><i class="fa fa-wrench fa-fw"></i> <span>Tools</span></a>
diff --git a/src/index.html b/src/index.html
index e6144e262a..cc7064bb5a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -117,9 +117,7 @@
     <script src="app/vault/vaultEditFolderController.js"></script>
     <script src="app/vault/vaultAddFolderController.js"></script>
     <script src="app/vault/vaultShareController.js"></script>
-
-    <script src="app/sharing/sharingModule.js"></script>
-    <script src="app/sharing/sharingController.js"></script>
+    <script src="app/vault/vaultSubvaultsController.js"></script>
 
     <script src="app/organization/organizationModule.js"></script>
     <script src="app/organization/organizationDashboardController.js"></script>