diff --git a/src/app/services/cryptoService.js b/src/app/services/cryptoService.js
index 63be004e35..629dd199c9 100644
--- a/src/app/services/cryptoService.js
+++ b/src/app/services/cryptoService.js
@@ -30,6 +30,7 @@ angular
                 return;
             }
 
+            _service.clearOrgKeys();
             var orgKeysb64 = {},
                 _orgKeys = {},
                 setKey = false;
diff --git a/src/app/vault/views/vaultSubvaults.html b/src/app/vault/views/vaultSubvaults.html
index 30b8efd9a3..d0dcfc3093 100644
--- a/src/app/vault/views/vaultSubvaults.html
+++ b/src/app/vault/views/vaultSubvaults.html
@@ -26,39 +26,32 @@
         </div>
         <div class="box-body" ng-class="{'no-padding': subvaultLogins.length}">
             <div ng-show="!subvaultLogins.length">
-                <p>No logins in this folder.</p>
+                <p>No logins in this subvault.</p>
                 <button type="button" ng-click="addLogin(subvault)" class="btn btn-default btn-flat">Add a Login</button>
             </div>
             <div class="table-responsive" ng-show="subvaultLogins.length">
-                <table class="table table-striped table-hover table-selectable">
-                    <thead>
-                        <tr>
-                            <th style="width: 75px; min-width: 75px;"></th>
-                            <th>Name</th>
-                            <th style="width: 300px;">Username</th>
-                        </tr>
-                    </thead>
+                <table class="table table-striped table-hover table-vmiddle">
                     <tbody>
                         <tr ng-repeat="login in subvaultLogins = (logins | filter: filterBySubvault(subvault) |
                             filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])">
-                            <td class="actions">
-                                <button type="button" ng-click="deleteLogin(login)" class="btn btn-link btn-table"
-                                        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>
+                            <td style="width: 70px;">
+                                <div class="btn-group" uib-dropdown dropdown-append-to-body>
+                                    <button type="button" class="btn btn-default" uib-dropdown-toggle>
+                                        <i class="fa fa-cog"></i> <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu" uib-dropdown-menu>
+                                        <li>
+                                            <a href="javascript:void(0)" ng-click="deleteLogin(login)" class="text-red">
+                                                <i class="fa fa-fw fa-trash"></i> Delete
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
                             </td>
-                            <td ng-click="editLogin(login)">
-                                <span ng-click="$event.stopPropagation()">
-                                    {{login.name}}
-                                    <i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
-                                </span>
-                            </td>
-                            <td ng-click="editLogin(login)">
-                                <span ng-click="$event.stopPropagation()">{{login.username}}</span>
+                            <td>
+                                <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>
+                                <div class="text-sm text-muted">{{login.username}}</div>
                             </td>
                         </tr>
                     </tbody>