diff --git a/src/app/organization/views/organizationSubvaultsUsers.html b/src/app/organization/views/organizationSubvaultsUsers.html
index d23a72c0..ce21a8db 100644
--- a/src/app/organization/views/organizationSubvaultsUsers.html
+++ b/src/app/organization/views/organizationSubvaultsUsers.html
@@ -35,7 +35,7 @@
                         <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
                     </td>
                     <td style="width: 40px;" align="center">
-                        <i class="fa fa-pencil-square-o" ng-show="!user.readOnly" uib-tooltip="Can Edit"></i>
+                        <i class="fa fa-pencil-square-o" ng-show="!user.readOnly" title="Can Edit"></i>
                     </td>
                     <td style="width: 100px;">
                         {{user.type | enumName: 'OrgUserType'}}
diff --git a/src/app/settings/views/settingsDomains.html b/src/app/settings/views/settingsDomains.html
index a139eba4..0bc3dcd5 100644
--- a/src/app/settings/views/settingsDomains.html
+++ b/src/app/settings/views/settingsDomains.html
@@ -14,7 +14,7 @@
                     <button type="button" class="btn btn-box-tool" ng-click="addEdit(null)">
                         <i class="fa fa-plus-circle"></i> Add New
                     </button>
-                    <button type="button" class="btn btn-box-tool" data-widget="collapse" uib-tooltip="Collapse/Expand">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand">
                         <i class="fa fa-minus"></i>
                     </button>
                 </div>
@@ -25,10 +25,10 @@
                         <tbody ng-if="equivalentDomains.length">
                             <tr ng-repeat="customDomain in equivalentDomains track by $index">
                                 <td style="width: 80px; min-width: 80px;">
-                                    <button type="button" class="btn btn-link btn-table" uib-tooltip="Edit" ng-click="addEdit($index)">
+                                    <button type="button" class="btn btn-link btn-table" title="Edit" ng-click="addEdit($index)">
                                         <i class="fa fa-lg fa-pencil"></i>
                                     </button>
-                                    <button type="button" class="btn btn-link btn-table" uib-tooltip="Delete" ng-click="delete($index)">
+                                    <button type="button" class="btn btn-link btn-table" title="Delete" ng-click="delete($index)">
                                         <i class="fa fa-lg fa-trash"></i>
                                     </button>
                                 </td>
@@ -56,7 +56,7 @@
             <div class="box-header with-border">
                 <h3 class="box-title">Global Equivalent Domains</h3>
                 <div class="box-tools pull-right">
-                    <button type="button" class="btn btn-box-tool" data-widget="collapse" uib-tooltip="Collapse/Expand">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand">
                         <i class="fa fa-minus"></i>
                     </button>
                 </div>
@@ -67,15 +67,15 @@
                         <tbody ng-if="globalEquivalentDomains.length">
                             <tr ng-repeat="globalDomain in globalEquivalentDomains">
                                 <td style="width: 80px; min-width: 80px;">
-                                    <button type="button" class="btn btn-link btn-table" uib-tooltip="Exclude"
+                                    <button type="button" class="btn btn-link btn-table" title="Exclude"
                                             ng-if="!globalDomain.excluded" ng-click="toggleExclude(globalDomain)">
                                         <i class="fa fa-lg fa-ban"></i>
                                     </button>
-                                    <button type="button" class="btn btn-link btn-table" uib-tooltip="Include"
+                                    <button type="button" class="btn btn-link btn-table" title="Include"
                                             ng-if="globalDomain.excluded" ng-click="toggleExclude(globalDomain)">
                                         <i class="fa fa-lg fa-plus"></i>
                                     </button>
-                                    <button type="button" class="btn btn-link btn-table" uib-tooltip="Customize"
+                                    <button type="button" class="btn btn-link btn-table" title="Customize"
                                             ng-click="customize(globalDomain)">
                                         <i class="fa fa-lg fa-cut"></i>
                                     </button>
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index df6fb771..11b75f72 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -71,21 +71,21 @@
                 });
             });
 
-            $rootScope.vaultLogins = $filter('orderBy')(decLogins, ['sort', 'name', 'username']);
+            $rootScope.vaultLogins = $scope.logins = $filter('orderBy')(decLogins, ['sort', 'name', 'username']);
 
-            var chunks = chunk($rootScope.vaultLogins, 300);
-            $scope.logins = chunks[0];
-            var delay = 200;
-            angular.forEach(chunks, function (value, index) {
-                delay += 200;
+            //var chunks = chunk($rootScope.vaultLogins, 300);
+            //$scope.logins = chunks[0];
+            //var delay = 200;
+            //angular.forEach(chunks, function (value, index) {
+            //    delay += 200;
 
-                // skip the first chuck
-                if (index > 0) {
-                    $timeout(function () {
-                        Array.prototype.push.apply($scope.logins, value);
-                    }, delay);
-                }
-            });
+            //    // skip the first chuck
+            //    if (index > 0) {
+            //        $timeout(function () {
+            //            Array.prototype.push.apply($scope.logins, value);
+            //        }, delay);
+            //    }
+            //});
         }
 
         function sortScopedLoginData() {
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index 0562104a..f087d455 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -28,7 +28,7 @@
                         </li>
                     </ul>
                 </div>
-                <button type="button" class="btn btn-box-tool" data-widget="collapse" uib-tooltip="Collapse/Expand"
+                <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand"
                         ng-click="collapseExpand(null, true)">
                     <i class="fa" ng-class="{'fa-minus': !favoriteCollapsed, 'fa-plus': favoriteCollapsed}"></i>
                 </button>
@@ -75,7 +75,7 @@
                             </td>
                             <td>
                                 <a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
-                                <i class="fa fa-share-alt text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
+                                <i class="fa fa-share-alt text-muted" title="Shared" ng-show="login.organizationId"></i>
                                 <div class="text-sm text-muted">{{login.username}}</div>
                             </td>
                         </tr>
@@ -114,7 +114,7 @@
                         </li>
                     </ul>
                 </div>
-                <button type="button" class="btn btn-box-tool" data-widget="collapse" uib-tooltip="Collapse/Expand"
+                <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand"
                         ng-click="collapseExpand(folder)">
                     <i class="fa" ng-class="{'fa-minus': !folder.collapsed, 'fa-plus': folder.collapsed}"></i>
                 </button>
@@ -161,8 +161,8 @@
                             </td>
                             <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>
-                                <i class="fa fa-share-alt text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
+                                <i class="fa fa-star text-muted" title="Favorite" ng-show="login.favorite"></i>
+                                <i class="fa fa-share-alt text-muted" title="Shared" ng-show="login.organizationId"></i>
                                 <div class="text-sm text-muted">{{login.username}}</div>
                             </td>
                         </tr>
diff --git a/src/app/vault/views/vaultSubvaults.html b/src/app/vault/views/vaultSubvaults.html
index 39cc5c59..e4f78baa 100644
--- a/src/app/vault/views/vaultSubvaults.html
+++ b/src/app/vault/views/vaultSubvaults.html
@@ -29,7 +29,7 @@
                 {{subvault.name}} <small>{{subvaultLogins.length}} logins</small>
             </h3>
             <div class="box-tools">
-                <button type="button" class="btn btn-box-tool" data-widget="collapse" uib-tooltip="Collapse/Expand"
+                <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand"
                         ng-click="collapseExpand(subvault)">
                     <i class="fa" ng-class="{'fa-minus': !subvault.collapsed, 'fa-plus': subvault.collapsed}"></i>
                 </button>
@@ -74,7 +74,7 @@
                             </td>
                             <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>
+                                <i class="fa fa-star text-muted" title="Favorite" ng-show="login.favorite"></i>
                                 <div class="text-sm text-muted">{{login.username}}</div>
                             </td>
                         </tr>