diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.h b/MasterPassword/ObjC/Mac/MPPasswordWindowController.h
index 96a8dadd..c30eb6b1 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.h
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.h
@@ -18,5 +18,6 @@
 @property(nonatomic, weak) IBOutlet NSTextField *userLabel;
 
 - (void)unlock;
+- (IBAction)reload:(id)sender;
 
 @end
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
index 55cc7244..338e3bd5 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
@@ -14,7 +14,6 @@
 #define MPAlertUnlockMP     @"MPAlertUnlockMP"
 #define MPAlertIncorrectMP  @"MPAlertIncorrectMP"
 #define MPAlertCreateSite   @"MPAlertCreateSite"
-#define MPAlertLoadingData  @"MPAlertLoadingData"
 
 @interface MPPasswordWindowController()
 
@@ -22,7 +21,7 @@
 @property(nonatomic) BOOL siteFieldPreventCompletion;
 
 @property(nonatomic, strong) NSOperationQueue *backgroundQueue;
-@property(nonatomic, strong) NSConditionLock *loadingLock;
+@property(nonatomic, strong) NSAlert *loadingDataAlert;
 @end
 
 @implementation MPPasswordWindowController {
@@ -52,18 +51,11 @@
 //                            @"their passwords to change.  You'll need to update your profile for that site with the new password."];
 //            [moc saveToStore];
 //        }];
-        if (!self.inProgress && ![MPMacAppDelegate get].key) {
-            if (![MPMacAppDelegate get].activeUserForThread.saveKey)
-                [self unlock];
-            else
-                [self.window close];
-        }
+        [self handleUnloadedOrLocked];
     }                          forKeyPath:@"key" options:NSKeyValueObservingOptionInitial context:nil];
     [[NSNotificationCenter defaultCenter]
             addObserverForName:NSWindowDidBecomeKeyNotification object:self.window queue:nil usingBlock:^(NSNotification *note) {
-        [self waitUntilStoreLoaded];
-        if (!self.inProgress)
-            [self unlock];
+        [self checkLoadedAndUnlocked];
         [self.siteField selectText:nil];
     }];
     [[NSNotificationCenter defaultCenter]
@@ -73,35 +65,55 @@
     [[NSNotificationCenter defaultCenter]
             addObserverForName:MPSignedOutNotification object:nil queue:nil usingBlock:^(NSNotification *note) {
         _activeElementOID = nil;
-        [self.window close];
+        [self.siteField setStringValue:@""];
+        [self trySiteWithAction:NO];
+        [self handleUnloadedOrLocked];
     }];
     [[NSNotificationCenter defaultCenter]
             addObserverForName:USMStoreDidChangeNotification object:nil queue:nil usingBlock:^(NSNotification *note) {
-        [self waitUntilStoreLoaded];
+        [self checkLoadedAndUnlocked];
     }];
 
     [super windowDidLoad];
 }
 
-- (void)waitUntilStoreLoaded {
+- (void)handleUnloadedOrLocked {
+
+    if (!self.inProgress && ![MPMacAppDelegate get].key) {
+        MPUserEntity *activeUser = [MPMacAppDelegate get].activeUserForThread;
+        if (activeUser && !activeUser.saveKey)
+            [self unlock];
+        else
+            [self.window close];
+    }
+}
+
+- (void)checkLoadedAndUnlocked {
+
+    if ([self waitUntilStoreLoaded] && !self.inProgress)
+        [self unlock];
+}
+
+- (BOOL)waitUntilStoreLoaded {
 
     if ([MPMacAppDelegate managedObjectContextForThreadIfReady]) {
-        [self.loadingLock unlockWithCondition:1];
-        return;
+        [NSApp endSheet:self.loadingDataAlert.window];
+        return YES;
     }
 
-    [[NSAlert alertWithMessageText:@"Loading Your Data" defaultButton:nil alternateButton:nil otherButton:nil
-         informativeTextWithFormat:nil]
-            beginSheetModalForWindow:self.window modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
-                         contextInfo:MPAlertLoadingData];
-    [self.loadingLock = [[NSConditionLock alloc] initWithCondition:0] lockWhenCondition:1];
-    self.loadingLock = nil;
+    [self.loadingDataAlert = [NSAlert alertWithMessageText:@"Opening Your Data" defaultButton:@"..." alternateButton:nil otherButton:nil
+                                 informativeTextWithFormat:@""]
+            beginSheetModalForWindow:self.window modalDelegate:self
+                      didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil];
+
+    return NO;
 }
 
 - (void)unlock {
 
     [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
         MPUserEntity *activeUser = [[MPMacAppDelegate get] activeUserInContext:moc];
+        NSString *userName = activeUser.name;
         if (!activeUser)
                 // No user to sign in with.
             return;
@@ -125,7 +137,7 @@
                 NSAlert *alert = [NSAlert alertWithMessageText:@"Master Password is locked."
                                                  defaultButton:@"Unlock" alternateButton:@"Change" otherButton:@"Cancel"
                                      informativeTextWithFormat:@"The master password is required to unlock the application for:\n\n%@",
-                                                               activeUser.name];
+                                                               userName];
                 NSSecureTextField *passwordField = [[NSSecureTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )];
                 [alert setAccessoryView:passwordField];
                 [alert layout];
@@ -136,17 +148,17 @@
     }];
 }
 
+- (IBAction)reload:(id)sender {
+
+    [[MPMacAppDelegate get].storeManager reloadStore];
+}
+
 - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
 
     if (contextInfo == MPAlertIncorrectMP) {
         [self.window close];
         return;
     }
-    if (contextInfo == MPAlertLoadingData) {
-        [alert.window orderOut:nil];
-        [self waitUntilStoreLoaded];
-        return;
-    }
     if (contextInfo == MPAlertUnlockMP) {
         switch (returnCode) {
             case NSAlertAlternateReturn: {
@@ -355,7 +367,9 @@
 - (void)trySiteWithAction:(BOOL)doAction {
 
     NSString *siteName = [self.siteField stringValue];
+    [self.progressView startAnimation:nil];
     [self.backgroundQueue addOperationWithBlock:^{
+        BOOL actionHandled = NO;
         NSString *content = [[self activeElementForThread].content description];
         if (!content)
             content = @"";
@@ -369,15 +383,18 @@
             else if ([siteName length]) {
                 // Performing action without content but a site name is written.
                 [self createNewSite:siteName];
-                return;
+                actionHandled = YES;
             }
         }
 
         [[NSOperationQueue mainQueue] addOperationWithBlock:^{
             [self setContent:content];
+            [self.progressView stopAnimation:nil];
 
             self.tipField.alphaValue = 1;
-            if ([content length] == 0) {
+            if (actionHandled)
+                [self.tipField setStringValue:@""];
+            else if ([content length] == 0) {
                 if ([siteName length])
                     [self.tipField setStringValue:@"Hit ⌤ (ENTER) to create a new site."];
                 else
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
index 6761322c..5726caf1 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
@@ -12,6 +12,8 @@
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBNSLayoutConstraint</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
 			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
 			<string>NSProgressIndicator</string>
@@ -56,6 +58,35 @@
 							<reference key="NSNextResponder" ref="258451033"/>
 							<int key="NSvFlags">268</int>
 							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSButton" id="657577321">
+									<reference key="NSNextResponder" ref="1072816887"/>
+									<int key="NSvFlags">268</int>
+									<array class="NSMutableArray" key="NSSubviews"/>
+									<string key="NSFrame">{{10, 134}, {122, 19}}</string>
+									<reference key="NSSuperview" ref="1072816887"/>
+									<reference key="NSWindow"/>
+									<string key="NSReuseIdentifierKey">_NS:9</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSButtonCell" key="NSCell" id="134894493">
+										<int key="NSCellFlags">-2080374784</int>
+										<int key="NSCellFlags2">134217728</int>
+										<string key="NSContents">Round Rect Button</string>
+										<object class="NSFont" key="NSSupport">
+											<string key="NSName">LucidaGrande</string>
+											<double key="NSSize">12</double>
+											<int key="NSfFlags">16</int>
+										</object>
+										<string key="NSCellIdentifier">_NS:9</string>
+										<reference key="NSControlView" ref="657577321"/>
+										<int key="NSButtonFlags">-2038153216</int>
+										<int key="NSButtonFlags2">164</int>
+										<string key="NSAlternateContents"/>
+										<string key="NSKeyEquivalent"/>
+										<int key="NSPeriodicDelay">400</int>
+										<int key="NSPeriodicInterval">75</int>
+									</object>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								</object>
 								<object class="NSTextField" id="642967193">
 									<reference key="NSNextResponder" ref="1072816887"/>
 									<int key="NSvFlags">268</int>
@@ -244,7 +275,6 @@
 							<string key="NSFrame">{{224, 84}, {32, 32}}</string>
 							<reference key="NSSuperview" ref="258451033"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:945</string>
 							<int key="NSpiFlags">28682</int>
 							<double key="NSMaxValue">100</double>
@@ -321,6 +351,14 @@
 					</object>
 					<int key="connectionID">226</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reload:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="657577321"/>
+					</object>
+					<int key="connectionID">236</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -535,6 +573,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="79666172">
+								<reference key="firstItem" ref="402376051"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="657577321"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1072816887"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="884917592">
 								<reference key="firstItem" ref="402376051"/>
 								<int key="firstAttribute">3</int>
@@ -647,10 +701,27 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="150496551">
+								<reference key="firstItem" ref="657577321"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="402376051"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1072816887"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
 							<reference ref="49669222"/>
 							<reference ref="642967193"/>
 							<reference ref="139778114"/>
 							<reference ref="402376051"/>
+							<reference ref="657577321"/>
 						</array>
 						<reference key="parent" ref="258451033"/>
 					</object>
@@ -828,6 +899,29 @@
 						<reference key="object" ref="290707669"/>
 						<reference key="parent" ref="139778114"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">232</int>
+						<reference key="object" ref="657577321"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="134894493"/>
+						</array>
+						<reference key="parent" ref="1072816887"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">233</int>
+						<reference key="object" ref="134894493"/>
+						<reference key="parent" ref="657577321"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">234</int>
+						<reference key="object" ref="79666172"/>
+						<reference key="parent" ref="1072816887"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">235</int>
+						<reference key="object" ref="150496551"/>
+						<reference key="parent" ref="1072816887"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -835,6 +929,7 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="143.IBNSViewMetadataConstraints">
+					<reference ref="150496551"/>
 					<reference ref="865006730"/>
 					<reference ref="831384658"/>
 					<reference ref="566883659"/>
@@ -842,6 +937,7 @@
 					<reference ref="310034208"/>
 					<reference ref="1033518145"/>
 					<reference ref="884917592"/>
+					<reference ref="79666172"/>
 					<reference ref="63384401"/>
 					<reference ref="602857839"/>
 					<reference ref="314583816"/>
@@ -913,6 +1009,11 @@
 				</array>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="231.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="232.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="232.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="233.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="234.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="96.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="96.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
@@ -920,13 +1021,24 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">231</int>
+			<int key="maxID">236</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">MPPasswordWindowController</string>
 					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">reload:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">reload:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">reload:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="contentContainer">NSView</string>
 						<string key="contentField">NSTextField</string>