diff --git a/HNHUi b/HNHUi
index f4eb2867..fd3d932c 160000
--- a/HNHUi
+++ b/HNHUi
@@ -1 +1 @@
-Subproject commit f4eb2867994456286e0922f8f59f7053f803a094
+Subproject commit fd3d932c26af597eac68c8fe38e0f43bd98530a1
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 037e0a23..c7021400 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -307,7 +307,7 @@
 						<string key="NSFrame">{{80, 243}, {124, 22}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="7055742"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="11759019">
@@ -323,7 +323,7 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSCustomView" id="7055742">
+					<object class="NSCustomView" id="816254670">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews"/>
@@ -439,8 +439,8 @@
 						<int key="objectID">455</int>
 						<reference key="object" ref="87082330"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="866916677">
-								<reference key="firstItem" ref="7055742"/>
+							<object class="IBNSLayoutConstraint" id="26385821">
+								<reference key="firstItem" ref="816254670"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="87082330"/>
@@ -455,8 +455,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="793836719">
-								<reference key="firstItem" ref="7055742"/>
+							<object class="IBNSLayoutConstraint" id="313215172">
+								<reference key="firstItem" ref="816254670"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="87082330"/>
@@ -471,8 +471,8 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="172565834">
-								<reference key="firstItem" ref="7055742"/>
+							<object class="IBNSLayoutConstraint" id="112302846">
+								<reference key="firstItem" ref="816254670"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="87082330"/>
@@ -946,7 +946,7 @@
 							<reference ref="738135925"/>
 							<reference ref="333573736"/>
 							<reference ref="438007584"/>
-							<reference ref="7055742"/>
+							<reference ref="816254670"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1292,10 +1292,10 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">662</int>
-						<reference key="object" ref="7055742"/>
+						<reference key="object" ref="816254670"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="956213931">
-								<reference key="firstItem" ref="7055742"/>
+							<object class="IBNSLayoutConstraint" id="574545128">
+								<reference key="firstItem" ref="816254670"/>
 								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
@@ -1305,7 +1305,7 @@
 									<double key="value">30</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="7055742"/>
+								<reference key="containingView" ref="816254670"/>
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
@@ -1315,23 +1315,23 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">663</int>
-						<reference key="object" ref="172565834"/>
+						<reference key="object" ref="112302846"/>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">665</int>
-						<reference key="object" ref="793836719"/>
+						<reference key="object" ref="313215172"/>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">667</int>
-						<reference key="object" ref="866916677"/>
+						<reference key="object" ref="26385821"/>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">669</int>
-						<reference key="object" ref="956213931"/>
-						<reference key="parent" ref="7055742"/>
+						<reference key="object" ref="574545128"/>
+						<reference key="parent" ref="816254670"/>
 					</object>
 				</array>
 			</object>
@@ -1372,9 +1372,9 @@
 					<reference ref="392529850"/>
 					<reference ref="522224579"/>
 					<reference ref="246479646"/>
-					<reference ref="172565834"/>
-					<reference ref="793836719"/>
-					<reference ref="866916677"/>
+					<reference ref="112302846"/>
+					<reference ref="313215172"/>
+					<reference ref="26385821"/>
 				</array>
 				<boolean value="NO" key="455.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
 				<boolean value="NO" key="455.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1451,7 +1451,7 @@
 				<string key="652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="661.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="662.IBNSViewMetadataConstraints">
-					<reference ref="956213931"/>
+					<reference ref="574545128"/>
 				</array>
 				<boolean value="NO" key="662.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="662.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1464,7 +1464,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">677</int>
+			<int key="maxID">683</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib
index 8eeee9b1..36a34b1c 100644
--- a/MacPass/Base.lproj/PasswordInputView.xib
+++ b/MacPass/Base.lproj/PasswordInputView.xib
@@ -51,7 +51,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{125, 175}, {113, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="662046682"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -100,7 +99,6 @@
 						</set>
 						<string key="NSFrame">{{157, 200}, {48, 48}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="660673733"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -129,7 +127,6 @@
 						</set>
 						<string key="NSFrame">{{83, 94}, {197, 22}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="769513826"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -154,7 +151,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{86, 123}, {191, 22}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="333885704"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -192,7 +188,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 126}, {64, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="219521947"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -213,7 +208,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{35, 99}, {46, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1034097047"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -234,7 +228,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{200, 50}, {83, 32}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSHuggingPriority">{250, 250}</string>
 						<bool key="NSEnabled">YES</bool>
@@ -257,7 +250,6 @@
 				</array>
 				<string key="NSFrameSize">{362, 268}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="204058255"/>
 				<string key="NSAntiCompressionPriority">{751, 750}</string>
 				<string key="NSClassName">NSView</string>
@@ -1010,69 +1002,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">296</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">MPPasswordInputController</string>
-					<string key="superclassName">MPViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">_decrypt:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">_decrypt:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">_decrypt:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="errorImageView">NSImageView</string>
-						<string key="errorInfoTextField">NSTextField</string>
-						<string key="keyPathControl">NSPathControl</string>
-						<string key="passwordTextField">NSSecureTextField</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="errorImageView">
-							<string key="name">errorImageView</string>
-							<string key="candidateClassName">NSImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="errorInfoTextField">
-							<string key="name">errorInfoTextField</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="keyPathControl">
-							<string key="name">keyPathControl</string>
-							<string key="candidateClassName">NSPathControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="passwordTextField">
-							<string key="name">passwordTextField</string>
-							<string key="candidateClassName">NSSecureTextField</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MPPasswordInputController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MPViewController</string>
-					<string key="superclassName">NSViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MPViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 7f0a4253..f13b688d 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>BD5</string>
+	<string>BD7</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>