diff --git a/HNHUi b/HNHUi
index 99a6785a..8dce44b4 160000
--- a/HNHUi
+++ b/HNHUi
@@ -1 +1 @@
-Subproject commit 99a6785a37570a8cb0749bad4522bf69899f4f9c
+Subproject commit 8dce44b4ad3015f7534d8972f2352a0d39c5731e
diff --git a/MacPass/Base.lproj/PasswordEditView.xib b/MacPass/Base.lproj/PasswordEditView.xib
deleted file mode 100644
index cd23cdcc..00000000
--- a/MacPass/Base.lproj/PasswordEditView.xib
+++ /dev/null
@@ -1,947 +0,0 @@
-
-
-
- 1080
- 12E55
- 3084
- 1187.39
- 626.00
-
-
- IBNSLayoutConstraint
- NSButton
- NSButtonCell
- NSCustomObject
- NSCustomView
- NSPathCell
- NSPathControl
- NSSecureTextField
- NSSecureTextFieldCell
- NSTextField
- NSTextFieldCell
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
- YES
-
-
diff --git a/MacPass/DocumentSettingsWindow.xib b/MacPass/DatabaseSettingsWindow.xib
similarity index 100%
rename from MacPass/DocumentSettingsWindow.xib
rename to MacPass/DatabaseSettingsWindow.xib
diff --git a/MacPass/MPDocumentSettingsWindowController.h b/MacPass/MPDatabaseSettingsWindowController.h
similarity index 100%
rename from MacPass/MPDocumentSettingsWindowController.h
rename to MacPass/MPDatabaseSettingsWindowController.h
diff --git a/MacPass/MPDocumentSettingsWindowController.m b/MacPass/MPDatabaseSettingsWindowController.m
similarity index 100%
rename from MacPass/MPDocumentSettingsWindowController.m
rename to MacPass/MPDatabaseSettingsWindowController.m
diff --git a/MacPass/MPFirstResonderNotification.h b/MacPass/MPFirstResonderNotification.h
deleted file mode 100644
index 6c93f1f7..00000000
--- a/MacPass/MPFirstResonderNotification.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// MPFirstResonderNotification.h
-// MacPass
-//
-// Created by Michael Starke on 20.06.13.
-// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import
-
-@protocol MPFirstResonderNotification
-
-@required
-- (BOOL)becomeFirstResponder;
-
-@end
diff --git a/MacPass/MPPasswordEditViewController.h b/MacPass/MPPasswordEditViewController.h
deleted file mode 100644
index 3954a89d..00000000
--- a/MacPass/MPPasswordEditViewController.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MPPasswordEditViewController.h
-// MacPass
-//
-// Created by Michael Starke on 29.04.13.
-// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import "MPViewController.h"
-
-@interface MPPasswordEditViewController : MPViewController
-
-@end
diff --git a/MacPass/MPPasswordEditViewController.m b/MacPass/MPPasswordEditViewController.m
deleted file mode 100644
index f3ccbba8..00000000
--- a/MacPass/MPPasswordEditViewController.m
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// MPPasswordEditViewController.m
-// MacPass
-//
-// Created by Michael Starke on 29.04.13.
-// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import "MPPasswordEditViewController.h"
-#import "MPKeyfilePathControlDelegate.h"
-#import "MPDocumentWindowController.h"
-#import "MPDocument.h"
-
-@interface MPPasswordEditViewController ()
-@property (weak) IBOutlet NSSecureTextField *passwordTextField;
-@property (weak) IBOutlet NSPathControl *keyfilePathControl;
-@property (strong) MPKeyfilePathControlDelegate *pathControlDelegate;
-
-- (IBAction)_change:(id)sender;
-- (IBAction)_cancel:(id)sender;
-
-@end
-
-@implementation MPPasswordEditViewController
-
-- (id)init {
- return [self initWithNibName:@"PasswordEditView" bundle:nil];
-}
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
- self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
- if(self) {
- _pathControlDelegate = [[MPKeyfilePathControlDelegate alloc] init];
- }
- return self;
-}
-
-
-- (NSResponder *)reconmendedFirstResponder {
- return self.passwordTextField;
-}
-
-- (void)didLoadView {
- [self.keyfilePathControl setDelegate:self.pathControlDelegate];
-}
-
-- (IBAction)_change:(id)sender {
- MPDocument *document = [[self windowController] document];
- if(document) {
- document.key = [self.keyfilePathControl URL];
- NSString *password = [self.passwordTextField stringValue];
- if([password length] > 0) {
- document.password = password;
- }
- else {
- document.password = nil;
- }
- }
- id mainWindowController = [[[self view] window] windowController];
- [mainWindowController showEntries];
-}
-
-- (IBAction)_cancel:(id)sender {
- id mainWindowController = [[[self view] window] windowController];
- [mainWindowController showEntries];
-}
-@end
diff --git a/MacPass/MPPasswordStringFormatter.h b/MacPass/MPPasswordStringFormatter.h
new file mode 100644
index 00000000..5cb8425a
--- /dev/null
+++ b/MacPass/MPPasswordStringFormatter.h
@@ -0,0 +1,13 @@
+//
+// MPPasswordStringFormatter.h
+// MacPass
+//
+// Created by Michael Starke on 06.07.13.
+// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import
+
+@interface MPPasswordStringFormatter : NSFormatter
+
+@end
diff --git a/MacPass/MPPasswordStringFormatter.m b/MacPass/MPPasswordStringFormatter.m
new file mode 100644
index 00000000..758958ac
--- /dev/null
+++ b/MacPass/MPPasswordStringFormatter.m
@@ -0,0 +1,13 @@
+//
+// MPPasswordStringFormatter.m
+// MacPass
+//
+// Created by Michael Starke on 06.07.13.
+// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPPasswordStringFormatter.h"
+
+@implementation MPPasswordStringFormatter
+
+@end
diff --git a/MacPass/MPResponderQuery.h b/MacPass/MPResponderQuery.h
deleted file mode 100644
index 3308e4c3..00000000
--- a/MacPass/MPResponderQuery.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// MPResponderQuery.h
-// MacPass
-//
-// Created by Michael Starke on 11.06.13.
-// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import
-
-@protocol MPResponderQuery
-@required
-- (BOOL)containsFirstResponder;
-
-@end
diff --git a/MacPass/UnprotectedWarningView.xib b/MacPass/UnprotectedWarningView.xib
new file mode 100644
index 00000000..2a86a6fe
--- /dev/null
+++ b/MacPass/UnprotectedWarningView.xib
@@ -0,0 +1,434 @@
+
+
+
+ 1080
+ 12E55
+ 3084
+ 1187.39
+ 626.00
+
+
+ IBNSLayoutConstraint
+ NSCustomObject
+ NSCustomView
+ NSImageCell
+ NSImageView
+ NSTextField
+ NSTextFieldCell
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+ YES
+ 3
+
+ YES
+
+
diff --git a/MacPass/de.lproj/MainMenu.strings b/MacPass/de.lproj/MainMenu.strings
index 525891f7..f31b45c9 100644
--- a/MacPass/de.lproj/MainMenu.strings
+++ b/MacPass/de.lproj/MainMenu.strings
@@ -132,7 +132,10 @@
"1181.title" = "Toggle Inspector";
/* Class = "NSMenuItem"; title = "Show Password Creator"; ObjectID = "1200"; */
-"1200.title" = "Passwortgenerator anzeigen…";
+"1200.title" = "Show Password Creator";
-/* Class = "NSMenuItem"; title = "Change Password…"; ObjectID = "1203"; */
-"1203.title" = "Hautpassword ändern…";
+/* Class = "NSMenuItem"; title = "Change Master Password…"; ObjectID = "1203"; */
+"1203.title" = "Change Master Password…";
+
+/* Class = "NSMenuItem"; title = "Database Settings…"; ObjectID = "1231"; */
+"1231.title" = "Database Settings…";
diff --git a/MacPass/de.lproj/PasswordEditView.strings b/MacPass/de.lproj/PasswordEditView.strings
deleted file mode 100644
index 475d34ef..00000000
--- a/MacPass/de.lproj/PasswordEditView.strings
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/* Class = "NSButtonCell"; title = "Change"; ObjectID = "32"; */
-"32.title" = "Password ändern";
-
-/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "33"; */
-"33.title" = "Passwort";
-
-/* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "37"; */
-"37.title" = "Schlüsseldatei";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "38"; */
-"38.title" = "Abbrechen";
-
-/* Class = "NSTextFieldCell"; title = "Change Password/Keyfile"; ObjectID = "46"; */
-"46.title" = "Password/Schlüssel ändern!";
diff --git a/MacPass/en.lproj/MainMenu.strings b/MacPass/en.lproj/MainMenu.strings
index 9214c828..f31b45c9 100644
--- a/MacPass/en.lproj/MainMenu.strings
+++ b/MacPass/en.lproj/MainMenu.strings
@@ -134,5 +134,8 @@
/* Class = "NSMenuItem"; title = "Show Password Creator"; ObjectID = "1200"; */
"1200.title" = "Show Password Creator";
-/* Class = "NSMenuItem"; title = "Change Password…"; ObjectID = "1203"; */
-"1203.title" = "Change Password…";
+/* Class = "NSMenuItem"; title = "Change Master Password…"; ObjectID = "1203"; */
+"1203.title" = "Change Master Password…";
+
+/* Class = "NSMenuItem"; title = "Database Settings…"; ObjectID = "1231"; */
+"1231.title" = "Database Settings…";
diff --git a/MacPass/en.lproj/PasswordEditView.strings b/MacPass/en.lproj/PasswordEditView.strings
deleted file mode 100644
index 6f8b6d28..00000000
--- a/MacPass/en.lproj/PasswordEditView.strings
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/* Class = "NSButtonCell"; title = "Change"; ObjectID = "32"; */
-"32.title" = "Change";
-
-/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "33"; */
-"33.title" = "Password";
-
-/* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "37"; */
-"37.title" = "Keyfile";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "38"; */
-"38.title" = "Cancel";
-
-/* Class = "NSTextFieldCell"; title = "Change Password/Keyfile"; ObjectID = "46"; */
-"46.title" = "Change Password/Keyfile";