diff --git a/src/popup/app/services/loginService.js b/src/popup/app/services/loginService.js
index 7e65bbe0a90..e043799e5d8 100644
--- a/src/popup/app/services/loginService.js
+++ b/src/popup/app/services/loginService.js
@@ -72,6 +72,8 @@
                             userService.clearEmail(function () {
                                 siteService.clear(userId, function () {
                                     folderService.clear(userId, function () {
+                                        $rootScope.vaultSites = null;
+                                        $rootScope.vaultFolders = null;
                                         callback();
                                     });
                                 });
diff --git a/src/popup/app/settings/views/settingsFolders.html b/src/popup/app/settings/views/settingsFolders.html
index 659e71cc21b..ea9f42bc6a8 100644
--- a/src/popup/app/settings/views/settingsFolders.html
+++ b/src/popup/app/settings/views/settingsFolders.html
@@ -22,7 +22,7 @@
         <p>
             There are no folders to list.
             <a ui-sref="addFolder({animation: 'in-slide-up'})" style="margin-top: 20px;"
-               class="btn btn-link btn-lg btn-block">Add a Folder</a>
+               class="btn btn-link btn-block">Add a Folder</a>
         </p>
     </div>
     <div class="page-loading" ng-if="!loaded">
diff --git a/src/services/folderService.js b/src/services/folderService.js
index b7c87a793c7..f3ff7556cf3 100644
--- a/src/services/folderService.js
+++ b/src/services/folderService.js
@@ -82,8 +82,10 @@ function initFolderService() {
             }
 
             Q.all(promises).then(function () {
-                self.decryptedFolderCache = decFolders;
-                deferred.resolve(self.decryptedFolderCache);
+                if (decFolders.length > 0) {
+                    self.decryptedFolderCache = decFolders;
+                }
+                deferred.resolve(decFolders);
             });
         });
 
@@ -177,6 +179,8 @@ function initFolderService() {
             throw 'callback function required';
         }
 
+        var self = this;
+
         chrome.storage.local.remove('folders_' + userId, function () {
             self.decryptedFolderCache = null;
             callback();
diff --git a/src/services/siteService.js b/src/services/siteService.js
index e3def38a128..712a1cb0eb2 100644
--- a/src/services/siteService.js
+++ b/src/services/siteService.js
@@ -191,6 +191,8 @@ function initSiteService() {
             throw 'callback function required';
         }
 
+        var self = this;
+
         chrome.storage.local.remove('sites_' + userId, function () {
             self.decryptedSiteCache = null;
             callback();
diff --git a/store/chrome/en-US/assets/tile-large.png b/store/chrome/en-US/assets/tile-large.png
index 08f5a947b97..5ebb2d3fcb2 100644
Binary files a/store/chrome/en-US/assets/tile-large.png and b/store/chrome/en-US/assets/tile-large.png differ
diff --git a/store/chrome/en-US/screenshots/edit.png b/store/chrome/en-US/screenshots/edit.png
new file mode 100644
index 00000000000..342d38a3511
Binary files /dev/null and b/store/chrome/en-US/screenshots/edit.png differ
diff --git a/store/chrome/en-US/screenshots/vault.png b/store/chrome/en-US/screenshots/vault.png
index d77bcf80192..5e1c3432722 100644
Binary files a/store/chrome/en-US/screenshots/vault.png and b/store/chrome/en-US/screenshots/vault.png differ