From 15b14d67db62ff34682ae9228356e25e238d3866 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sat, 23 Apr 2016 11:54:07 -0400
Subject: [PATCH] Improvements to layout, password types and preparations for
 security answers.

---
 External/Pearl                                |   2 +-
 MasterPassword/ObjC/MPAlgorithmV0.m           |  10 +-
 .../ObjC/Mac/MPPasswordWindowController.m     |  10 +-
 .../ObjC/Mac/MPPasswordWindowController.xib   | 922 +++++++++++-------
 MasterPassword/ObjC/Mac/MPSiteModel.m         |   9 +
 5 files changed, 565 insertions(+), 388 deletions(-)

diff --git a/External/Pearl b/External/Pearl
index 8b6e3481..db613dce 160000
--- a/External/Pearl
+++ b/External/Pearl
@@ -1 +1 @@
-Subproject commit 8b6e3481d7963d08cd50fc5994702f2abdce3cc5
+Subproject commit db613dce0a2a7ac83c866e9d0578038d45ec0c31
diff --git a/MasterPassword/ObjC/MPAlgorithmV0.m b/MasterPassword/ObjC/MPAlgorithmV0.m
index 538f45aa..522ea598 100644
--- a/MasterPassword/ObjC/MPAlgorithmV0.m
+++ b/MasterPassword/ObjC/MPAlgorithmV0.m
@@ -179,7 +179,7 @@ NSOperationQueue *_mpwQueue = nil;
             return @"PIN";
 
         case MPSiteTypeGeneratedName:
-            return @"Login Name";
+            return @"Name";
 
         case MPSiteTypeGeneratedPhrase:
             return @"Phrase";
@@ -281,7 +281,7 @@ NSOperationQueue *_mpwQueue = nil;
 
 - (NSArray *)allTypes {
 
-    return [self allTypesStartingWith:MPSiteTypeGeneratedMaximum];
+    return [self allTypesStartingWith:MPSiteTypeGeneratedPhrase];
 }
 
 - (NSArray *)allTypesStartingWith:(MPSiteType)startingType {
@@ -298,6 +298,10 @@ NSOperationQueue *_mpwQueue = nil;
 - (MPSiteType)nextType:(MPSiteType)type {
 
     switch (type) {
+        case MPSiteTypeGeneratedPhrase:
+            return MPSiteTypeGeneratedName;
+        case MPSiteTypeGeneratedName:
+            return MPSiteTypeGeneratedMaximum;
         case MPSiteTypeGeneratedMaximum:
             return MPSiteTypeGeneratedLong;
         case MPSiteTypeGeneratedLong:
@@ -313,7 +317,7 @@ NSOperationQueue *_mpwQueue = nil;
         case MPSiteTypeStoredPersonal:
             return MPSiteTypeStoredDevicePrivate;
         case MPSiteTypeStoredDevicePrivate:
-            return MPSiteTypeGeneratedMaximum;
+            return MPSiteTypeGeneratedPhrase;
         default:
             return MPSiteTypeGeneratedLong;
     }
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
index 4d0f8551..cf469915 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
@@ -427,15 +427,14 @@
 - (IBAction)changeType:(id)sender {
 
     MPSiteModel *site = self.selectedSite;
-    NSArray *types = [site.algorithm allTypesStartingWith:MPSiteTypeGeneratedPIN];
+    NSArray *types = [site.algorithm allTypes];
     [self.passwordTypesMatrix renewRows:(NSInteger)[types count] columns:1];
     for (NSUInteger t = 0; t < [types count]; ++t) {
         MPSiteType type = (MPSiteType)[types[t] unsignedIntegerValue];
         NSString *title = [site.algorithm nameOfType:type];
         if (type & MPSiteTypeClassGenerated)
-            title = [site.algorithm generatePasswordForSiteNamed:site.name ofType:type
-                                                     withCounter:site.counter
-                                                        usingKey:[MPMacAppDelegate get].key];
+            title = strf( @"%@ – %@", [site.algorithm generatePasswordForSiteNamed:site.name ofType:type withCounter:site.counter
+                                                                          usingKey:[MPMacAppDelegate get].key], title );
 
         NSButtonCell *cell = [self.passwordTypesMatrix cellAtRow:(NSInteger)t column:0];
         cell.tag = type;
@@ -443,11 +442,12 @@
         cell.title = title;
     }
 
+    self.passwordTypesBox.title = strf( @"Choose a password type for %@:", site.name );
+
     NSAlert *alert = [NSAlert new];
     [alert addButtonWithTitle:@"Save"];
     [alert addButtonWithTitle:@"Cancel"];
     [alert setMessageText:@"Change Password Type"];
-    [alert setInformativeText:strf( @"Choose a new password type for: %@", site.name )];
     [alert setAccessoryView:self.passwordTypesBox];
     [alert layout];
     [alert beginSheetModalForWindow:self.window modalDelegate:self
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
index 1d88311c..d632cae7 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
@@ -42,13 +42,13 @@
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="NGk-Io-Buc" userLabel="Top Box">
                         <rect key="frame" x="20" y="390" width="600" height="206"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ond-dT-x5d" userLabel="Site Password Tip">
-                                <rect key="frame" x="220" y="144" width="160" height="14"/>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ond-dT-x5d" userLabel="Site Password Label">
+                                <rect key="frame" x="157" y="144" width="285" height="14"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Your password for apple.com:" id="CgJ-XZ-6Hy">
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Your password for apple.com (hit &lt;⏎ enter&gt; to copy):" id="CgJ-XZ-6Hy">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -118,12 +118,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
-                                    <binding destination="-2" name="hidden" keyPath="locked" id="I7S-x6-XZk">
-                                        <dictionary key="options">
-                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                        </dictionary>
-                                    </binding>
-                                    <binding destination="-2" name="hidden2" keyPath="newUser" previousBinding="I7S-x6-XZk" id="HKK-Eu-1qV">
+                                    <binding destination="-2" name="hidden2" keyPath="alternatePressed" previousBinding="I7S-x6-XZk" id="fyE-OF-w7f">
                                         <dictionary key="options">
                                             <integer key="NSMultipleValuesPlaceholder" value="-1"/>
                                             <integer key="NSNoSelectionPlaceholder" value="-1"/>
@@ -132,31 +127,31 @@
                                             <string key="NSValueTransformerName">NSNegateBoolean</string>
                                         </dictionary>
                                     </binding>
+                                    <binding destination="-2" name="hidden" keyPath="locked" id="I7S-x6-XZk">
+                                        <dictionary key="options">
+                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                        </dictionary>
+                                    </binding>
                                 </connections>
                             </textField>
-                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sYt-eL-uwt" userLabel="Initial Tip">
-                                <rect key="frame" x="46" y="58" width="508" height="90"/>
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sYt-eL-uwt" userLabel="Initial Tip">
+                                <rect key="frame" x="-26" y="58" width="652" height="90"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </shadow>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="9c4-NI-NM0">
                                     <font key="font" size="12" name="HelveticaNeue"/>
-                                    <string key="title">— When you create a new account, use the password Master Password gives you for it.
-— Next time you log into an existing account, update its password to Master Password's.
-— Your "site name" can be any name; we recommend the bare domain name (eg. apple.com).
-— Make your new master password strong (eg. a short sentence) and tell *nobody*.
-— Share your site's password instead.  You can change it if necessary.</string>
+                                    <string key="title">– When you create an account with a site, use Master Password to create a password for it.
+– For accounts you already have, change the password to that created by Master Password for it.
+– To get a password, enter the site's bare domain name in the "site name" field (eg. apple.com).
+– For your master password, think of a strong password (eg. a short sentence). Tell *nobody*.
+– It's OK to share your site passwords.  They can be changed if necessary.</string>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
-                                    <binding destination="-2" name="hidden" keyPath="locked" id="yDL-cR-bDf">
-                                        <dictionary key="options">
-                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                        </dictionary>
-                                    </binding>
-                                    <binding destination="-2" name="hidden2" keyPath="newUser" previousBinding="yDL-cR-bDf" id="fus-M7-S1J">
+                                    <binding destination="-2" name="hidden2" keyPath="alternatePressed" previousBinding="yDL-cR-bDf" id="OiC-RT-uDB">
                                         <dictionary key="options">
                                             <integer key="NSMultipleValuesPlaceholder" value="-1"/>
                                             <integer key="NSNoSelectionPlaceholder" value="-1"/>
@@ -165,6 +160,11 @@
                                             <string key="NSValueTransformerName">NSNegateBoolean</string>
                                         </dictionary>
                                     </binding>
+                                    <binding destination="-2" name="hidden" keyPath="locked" id="yDL-cR-bDf">
+                                        <dictionary key="options">
+                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                        </dictionary>
+                                    </binding>
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XUV-zU-Y9c" userLabel="Site Password">
@@ -237,7 +237,6 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </searchFieldCell>
                                 <connections>
-                                    <action selector="doSearchSites:" target="-2" id="72O-59-xYV"/>
                                     <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="Skr-1g-quT">
                                         <dictionary key="options">
                                             <string key="NSValueTransformerName">NSNegateBoolean</string>
@@ -278,7 +277,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="33" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="xvJ-5c-vDp" customClass="MPSitesTableView">
-                                    <rect key="frame" x="0.0" y="0.0" width="515" height="232"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="515" height="0.0"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
@@ -382,7 +381,7 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gAU-xs-aae">
-                        <rect key="frame" x="593" y="518" width="19" height="14"/>
+                        <rect key="frame" x="593" y="522" width="19" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -400,6 +399,18 @@
                             </binding>
                         </connections>
                     </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OnR-s6-d4P" userLabel="Site Name Label">
+                        <rect key="frame" x="209" y="330" width="223" height="20"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Maarten Billemont's password for:" id="1Lb-d0-fQD">
+                            <font key="font" size="14" name="HelveticaNeue"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
                     <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iGR-wo-ual" userLabel="Secure Master Password">
                         <rect key="frame" x="18" y="278" width="604" height="44"/>
                         <shadow key="shadow" blurRadius="0.5">
@@ -435,7 +446,7 @@
                             <outlet property="delegate" destination="-2" id="3es-rz-2Mx"/>
                         </connections>
                     </secureTextField>
-                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v80-wd-hUR" userLabel="Reveal Master Password">
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v80-wd-hUR" userLabel="Revealed Master Password">
                         <rect key="frame" x="18" y="278" width="604" height="44"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
@@ -474,36 +485,26 @@
                             <outlet property="delegate" destination="-2" id="2nK-Rc-uyR"/>
                         </connections>
                     </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R46-fx-n14">
-                        <rect key="frame" x="232" y="19" width="177" height="19"/>
-                        <shadow key="shadow">
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <buttonCell key="cell" type="recessed" title="Reset My Master Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="B7Z-72-fVP" customClass="MPNoStateButtonCell">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="12"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="resetMasterPassword:" target="-2" id="kCy-X0-teH"/>
-                            <binding destination="-2" name="hidden" keyPath="locked" id="LFo-aw-CMB">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </button>
                     <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lW3-2z-cEa" userLabel="Master Password Tip">
-                        <rect key="frame" x="190" y="255" width="260" height="15"/>
+                        <rect key="frame" x="208" y="255" width="224" height="15"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to temporarily reveal what you've typed." id="4Ep-xX-Ky8">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to reveal tips and unmask ●●●●." id="4Ep-xX-Ky8">
                             <font key="font" size="11" name="HelveticaNeue"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
+                            <binding destination="-2" name="hidden2" keyPath="alternatePressed" previousBinding="sdC-5X-XtI" id="RSi-LR-7AH">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                </dictionary>
+                            </binding>
                             <binding destination="-2" name="hidden" keyPath="locked" id="sdC-5X-XtI">
                                 <dictionary key="options">
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
@@ -511,17 +512,33 @@
                             </binding>
                         </connections>
                     </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OnR-s6-d4P" userLabel="Site Name Label">
-                        <rect key="frame" x="209" y="330" width="223" height="20"/>
+                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oy5-B7-hdN" userLabel="Revealed Master Password Tip">
+                        <rect key="frame" x="206.5" y="255" width="227" height="15"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Maarten Billemont's password for:" id="1Lb-d0-fQD">
-                            <font key="font" size="14" name="HelveticaNeue"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to reveal tips and unmask passw." id="bQ4-AN-S1A">
+                            <font key="font" size="11" name="HelveticaNeue"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
+                        <connections>
+                            <binding destination="-2" name="hidden2" keyPath="alternatePressed" previousBinding="TMg-Q5-hfH" id="WXy-Ud-Mkz">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="-2" name="hidden" keyPath="locked" id="TMg-Q5-hfH">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
                     </textField>
                     <searchField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CnS-iI-dhr" userLabel="Site Name">
                         <rect key="frame" x="62" y="278" width="516" height="44"/>
@@ -567,14 +584,14 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rhm-sC-xFS" userLabel="Site Name Tip">
-                        <rect key="frame" x="150" y="240" width="340" height="30"/>
+                        <rect key="frame" x="137" y="240" width="365" height="30"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="n3W-XU-dya">
                             <font key="font" size="11" name="HelveticaNeue"/>
-                            <string key="title">Hit enter ⏎ to copy the password, hold shift ⇧ to copy the answer.
+                            <string key="title">Hit enter ⏎ to copy the site's password, hold shift ⇧ for the login name.
 Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -592,53 +609,341 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <binding destination="-2" name="hidden" keyPath="locked" id="bcg-eq-V5Z"/>
                         </connections>
                     </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="brI-fg-Kav">
-                        <rect key="frame" x="260" y="45" width="122" height="19"/>
-                        <shadow key="shadow">
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <buttonCell key="cell" type="recessed" title="Change Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="FQu-fM-NWY" customClass="MPNoStateButtonCell">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="12"/>
-                            <string key="keyEquivalent">p</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="changePassword:" target="-2" id="oVC-Od-Ij2"/>
-                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="gxV-co-WNZ">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="selection.stored" previousBinding="gxV-co-WNZ" id="CgR-BD-v6H">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uol-dE-I8H">
-                        <rect key="frame" x="388" y="48" width="23" height="14"/>
+                    <stackView distribution="fill" orientation="horizontal" alignment="bottom" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pHt-gg-ZNX">
+                        <rect key="frame" x="61" y="20" width="519" height="152"/>
+                        <subviews>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Qo-iG-CQt">
+                                <rect key="frame" x="0.0" y="-1" width="109" height="19"/>
+                                <shadow key="shadow">
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                </shadow>
+                                <buttonCell key="cell" type="recessed" title="Set Login Name" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QFo-9y-aVe" customClass="MPNoStateButtonCell">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                    <font key="font" metaFont="systemBold" size="12"/>
+                                    <string key="keyEquivalent">l</string>
+                                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="changeLogin:" target="-2" id="vj4-nM-j0d"/>
+                                    <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="8yw-hl-jLO">
+                                        <dictionary key="options">
+                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                        </dictionary>
+                                    </binding>
+                                    <binding destination="mcS-ik-b0n" name="title" keyPath="selection.loginName" id="uub-7k-XZ8">
+                                        <dictionary key="options">
+                                            <string key="NSNullPlaceholder">Set Login Name</string>
+                                        </dictionary>
+                                    </binding>
+                                </connections>
+                            </button>
+                            <stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DT0-RU-3LT">
+                                <rect key="frame" x="117" y="0.0" width="177" height="152"/>
+                                <subviews>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uol-dE-I8H">
+                                        <rect key="frame" x="77" y="138" width="23" height="14"/>
+                                        <shadow key="shadow" blurRadius="0.5">
+                                            <size key="offset" width="0.0" height="1"/>
+                                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                        </shadow>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘P" id="MyN-x6-dMk">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                        <connections>
+                                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="MLo-fO-mx5">
+                                                <dictionary key="options">
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="MLo-fO-mx5" id="vpQ-kw-9ZS">
+                                                <dictionary key="options">
+                                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                            <binding destination="mcS-ik-b0n" name="hidden3" keyPath="selection.stored" previousBinding="vpQ-kw-9ZS" id="P81-aX-Vcs">
+                                                <dictionary key="options">
+                                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
+                                    </textField>
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="brI-fg-Kav">
+                                        <rect key="frame" x="41" y="111" width="96" height="19"/>
+                                        <shadow key="shadow">
+                                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                        </shadow>
+                                        <buttonCell key="cell" type="recessed" title="Set Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="FQu-fM-NWY" customClass="MPNoStateButtonCell">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                            <font key="font" metaFont="systemBold" size="12"/>
+                                            <string key="keyEquivalent">p</string>
+                                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="changePassword:" target="-2" id="oVC-Od-Ij2"/>
+                                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="gxV-co-WNZ">
+                                                <dictionary key="options">
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="selection.stored" previousBinding="gxV-co-WNZ" id="CgR-BD-v6H">
+                                                <dictionary key="options">
+                                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
+                                    </button>
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R46-fx-n14">
+                                        <rect key="frame" x="0.0" y="85" width="177" height="19"/>
+                                        <shadow key="shadow">
+                                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                        </shadow>
+                                        <buttonCell key="cell" type="recessed" title="Reset My Master Password" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="B7Z-72-fVP" customClass="MPNoStateButtonCell">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                            <font key="font" metaFont="systemBold" size="12"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="resetMasterPassword:" target="-2" id="kCy-X0-teH"/>
+                                            <binding destination="-2" name="hidden2" keyPath="newUser" previousBinding="LFo-aw-CMB" id="ara-jA-uHe">
+                                                <dictionary key="options">
+                                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                                </dictionary>
+                                            </binding>
+                                            <binding destination="-2" name="hidden" keyPath="locked" id="LFo-aw-CMB">
+                                                <dictionary key="options">
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
+                                    </button>
+                                    <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bgn-Ne-fQ7" userLabel="Version Container">
+                                        <rect key="frame" x="71" y="56" width="36" height="22"/>
+                                        <subviews>
+                                            <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mcq-qD-yte">
+                                                <rect key="frame" x="-3" y="-3" width="19" height="27"/>
+                                                <shadow key="shadow">
+                                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                                </shadow>
+                                                <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="73y-03-zHt"/>
+                                                <connections>
+                                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.algorithmVersion" id="GyA-hK-6cD"/>
+                                                </connections>
+                                            </stepper>
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gyg-Fh-yn7">
+                                                <rect key="frame" x="19" y="3" width="19" height="19"/>
+                                                <shadow key="shadow" blurRadius="0.5">
+                                                    <size key="offset" width="0.0" height="1"/>
+                                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                                </shadow>
+                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="V1" id="Pjy-Fm-zwB">
+                                                    <font key="font" size="12" name="HelveticaNeue-Medium"/>
+                                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+                                                </textFieldCell>
+                                                <connections>
+                                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.algorithm.description" id="w6W-Pf-5eN"/>
+                                                </connections>
+                                            </textField>
+                                        </subviews>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                        <connections>
+                                            <binding destination="-2" name="hidden2" keyPath="showVersionContainer" previousBinding="JxK-yi-Rdb" id="rHI-hY-WMj">
+                                                <dictionary key="options">
+                                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="JxK-yi-Rdb">
+                                                <dictionary key="options">
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
+                                    </stackView>
+                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6II-KA-cNi" userLabel="Counter Container">
+                                        <rect key="frame" x="75" y="26" width="28" height="22"/>
+                                        <subviews>
+                                            <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XgA-Vl-CKh" userLabel="Counter Stepper">
+                                                <rect key="frame" x="-3" y="-3" width="19" height="27"/>
+                                                <shadow key="shadow">
+                                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                                </shadow>
+                                                <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="ikF-n4-xiI"/>
+                                                <connections>
+                                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.counter" id="qmm-6z-boy"/>
+                                                </connections>
+                                            </stepper>
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NvO-kt-eZ2" userLabel="Counter Field">
+                                                <rect key="frame" x="19" y="2" width="11" height="19"/>
+                                                <shadow key="shadow" blurRadius="0.5">
+                                                    <size key="offset" width="0.0" height="1"/>
+                                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                                </shadow>
+                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1" id="dhQ-bJ-rn3">
+                                                    <font key="font" size="12" name="HelveticaNeue-Medium"/>
+                                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+                                                </textFieldCell>
+                                                <connections>
+                                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.counter" id="aA9-yw-cYE"/>
+                                                </connections>
+                                            </textField>
+                                        </subviews>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                        <connections>
+                                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="9vk-TH-Bm2">
+                                                <dictionary key="options">
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="selection.generated" previousBinding="9vk-TH-Bm2" id="B6u-H8-b9o">
+                                                <dictionary key="options">
+                                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
+                                    </stackView>
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vES-W5-m4x">
+                                        <rect key="frame" x="11" y="-1" width="155" height="19"/>
+                                        <shadow key="shadow">
+                                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                        </shadow>
+                                        <buttonCell key="cell" type="recessed" title="Change Password Type" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Fom-sN-EtZ" customClass="MPNoStateButtonCell">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                            <font key="font" metaFont="systemBold" size="12"/>
+                                            <string key="keyEquivalent">t</string>
+                                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="changeType:" target="-2" id="6Jj-7p-da9"/>
+                                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="Hat-GU-hcQ">
+                                                <dictionary key="options">
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <visibilityPriorities>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                </visibilityPriorities>
+                                <customSpacing>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                </customSpacing>
+                            </stackView>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="whJ-Bw-pr4">
+                                <rect key="frame" x="302" y="-1" width="129" height="19"/>
+                                <shadow key="shadow">
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                </shadow>
+                                <buttonCell key="cell" type="recessed" title="Security Questions" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="viw-z7-ZO4" customClass="MPNoStateButtonCell">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                    <font key="font" metaFont="systemBold" size="12"/>
+                                    <string key="keyEquivalent">s</string>
+                                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                                </buttonCell>
+                                <connections>
+                                    <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="1Fb-fu-HHj">
+                                        <dictionary key="options">
+                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                        </dictionary>
+                                    </binding>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XuF-Sp-6JD">
+                                <rect key="frame" x="439" y="-1" width="80" height="19"/>
+                                <shadow key="shadow">
+                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                                </shadow>
+                                <buttonCell key="cell" type="recessed" title="Delete Site" bezelStyle="recessed" alignment="center" refusesFirstResponder="YES" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="26m-of-YMQ" customClass="MPNoStateButtonCell">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                                    <font key="font" metaFont="systemBold" size="12"/>
+                                    <string key="keyEquivalent">d</string>
+                                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="deleteSite:" target="-2" id="mVT-O6-KfN"/>
+                                    <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="eqU-d2-XhQ">
+                                        <dictionary key="options">
+                                            <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                        </dictionary>
+                                    </binding>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <visibilityPriorities>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                        </visibilityPriorities>
+                        <customSpacing>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                        </customSpacing>
+                    </stackView>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="luC-0j-BeV">
+                        <rect key="frame" x="147" y="50" width="103" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘P" id="MyN-x6-dMk">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password Number:" id="weR-33-U49">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="MLo-fO-mx5">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="MLo-fO-mx5" id="vpQ-kw-9ZS">
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="6ot-Tv-JwM" id="vPO-sK-wWR">
                                 <dictionary key="options">
                                     <integer key="NSMultipleValuesPlaceholder" value="-1"/>
                                     <integer key="NSNoSelectionPlaceholder" value="-1"/>
@@ -647,7 +952,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
                                 </dictionary>
                             </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden3" keyPath="selection.stored" previousBinding="vpQ-kw-9ZS" id="P81-aX-Vcs">
+                            <binding destination="mcS-ik-b0n" name="hidden3" keyPath="selection.generated" previousBinding="vPO-sK-wWR" id="M6N-58-JGs">
                                 <dictionary key="options">
                                     <integer key="NSMultipleValuesPlaceholder" value="-1"/>
                                     <integer key="NSNoSelectionPlaceholder" value="-1"/>
@@ -656,22 +961,26 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
                                 </dictionary>
                             </binding>
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="6ot-Tv-JwM">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
                         </connections>
                     </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UpZ-rb-NXd" userLabel="Change Password Tip">
-                        <rect key="frame" x="256" y="68" width="129" height="14"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gjx-bt-fKM">
+                        <rect key="frame" x="146.5" y="80" width="100" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Click to set a password:" id="gjc-Fw-xa1">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password Version:" id="E77-5t-EKJ">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="WYo-IW-qdh"/>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="WYo-IW-qdh" id="C3l-ng-Hqh">
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="3YR-oa-2Fg" id="6L5-zI-w9Y">
                                 <dictionary key="options">
                                     <integer key="NSMultipleValuesPlaceholder" value="-1"/>
                                     <integer key="NSNoSelectionPlaceholder" value="-1"/>
@@ -680,15 +989,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
                                 </dictionary>
                             </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden4" keyPath="selection.content.length" previousBinding="83Q-cv-B55" id="ywp-JP-ogX">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="0"/>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden3" keyPath="selection.stored" previousBinding="C3l-ng-Hqh" id="83Q-cv-B55">
+                            <binding destination="mcS-ik-b0n" name="hidden3" keyPath="selection.generated" previousBinding="6L5-zI-w9Y" id="oZ2-Pp-A4T">
                                 <dictionary key="options">
                                     <integer key="NSMultipleValuesPlaceholder" value="-1"/>
                                     <integer key="NSNoSelectionPlaceholder" value="-1"/>
@@ -697,159 +998,15 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
                                 </dictionary>
                             </binding>
-                        </connections>
-                    </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vES-W5-m4x">
-                        <rect key="frame" x="243" y="19" width="155" height="19"/>
-                        <shadow key="shadow">
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <buttonCell key="cell" type="recessed" title="Change Password Type" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Fom-sN-EtZ" customClass="MPNoStateButtonCell">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="12"/>
-                            <string key="keyEquivalent">t</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="changeType:" target="-2" id="6Jj-7p-da9"/>
-                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="Hat-GU-hcQ">
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="3YR-oa-2Fg">
                                 <dictionary key="options">
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
                                 </dictionary>
                             </binding>
                         </connections>
-                    </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9b3-wy-KBb">
-                        <rect key="frame" x="309" y="2" width="23" height="14"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘T" id="HFM-Bk-akx">
-                            <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="CG8-3H-uiD">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="CG8-3H-uiD" id="n0n-ZB-u5H">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XuF-Sp-6JD">
-                        <rect key="frame" x="406" y="19" width="80" height="19"/>
-                        <shadow key="shadow">
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <buttonCell key="cell" type="recessed" title="Delete Site" bezelStyle="recessed" alignment="center" refusesFirstResponder="YES" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="26m-of-YMQ" customClass="MPNoStateButtonCell">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="12"/>
-                            <string key="keyEquivalent">d</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="deleteSite:" target="-2" id="mVT-O6-KfN"/>
-                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="eqU-d2-XhQ">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qal-PP-YtO">
-                        <rect key="frame" x="435" y="1" width="23" height="15"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘D" id="PPC-be-w4E">
-                            <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="pgW-yB-Zx3">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="pgW-yB-Zx3" id="XHu-Py-efU">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Qo-iG-CQt">
-                        <rect key="frame" x="126" y="19" width="109" height="19"/>
-                        <shadow key="shadow">
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <buttonCell key="cell" type="recessed" title="Set Login Name" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QFo-9y-aVe" customClass="MPNoStateButtonCell">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
-                            <font key="font" metaFont="systemBold" size="12"/>
-                            <string key="keyEquivalent">l</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="changeLogin:" target="-2" id="vj4-nM-j0d"/>
-                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="8yw-hl-jLO">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="title" keyPath="selection.loginName" id="uub-7k-XZ8">
-                                <dictionary key="options">
-                                    <string key="NSNullPlaceholder">Set Login Name</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ido-NQ-3MY">
-                        <rect key="frame" x="169" y="1" width="22" height="15"/>
-                        <shadow key="shadow" blurRadius="0.5">
-                            <size key="offset" width="0.0" height="1"/>
-                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘L" id="fUB-rF-7x8">
-                            <font key="font" size="11" name="HelveticaNeue"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="b3W-u1-1A2">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="b3W-u1-1A2" id="gTg-Go-ELg">
-                                <dictionary key="options">
-                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                    <integer key="NSNullPlaceholder" value="-1"/>
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dbM-ja-dKO" userLabel="Version Tip">
-                        <rect key="frame" x="155" y="106" width="332" height="14"/>
+                        <rect key="frame" x="100" y="106" width="332" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -876,95 +1033,24 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             </binding>
                         </connections>
                     </textField>
-                    <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bgn-Ne-fQ7" userLabel="Version Container">
-                        <rect key="frame" x="303" y="76" width="36" height="22"/>
-                        <subviews>
-                            <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mcq-qD-yte">
-                                <rect key="frame" x="-3" y="-3" width="19" height="27"/>
-                                <shadow key="shadow">
-                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                                </shadow>
-                                <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="73y-03-zHt"/>
-                                <connections>
-                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.algorithmVersion" id="GyA-hK-6cD"/>
-                                </connections>
-                            </stepper>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gyg-Fh-yn7">
-                                <rect key="frame" x="19" y="3" width="19" height="19"/>
-                                <shadow key="shadow" blurRadius="0.5">
-                                    <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                                </shadow>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="V1" id="Pjy-Fm-zwB">
-                                    <font key="font" size="12" name="HelveticaNeue-Medium"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
-                                </textFieldCell>
-                                <connections>
-                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.algorithm.description" id="w6W-Pf-5eN"/>
-                                </connections>
-                            </textField>
-                        </subviews>
-                        <visibilityPriorities>
-                            <integer value="1000"/>
-                            <integer value="1000"/>
-                        </visibilityPriorities>
-                        <customSpacing>
-                            <real value="3.4028234663852886e+38"/>
-                            <real value="3.4028234663852886e+38"/>
-                        </customSpacing>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ido-NQ-3MY">
+                        <rect key="frame" x="104" y="1" width="22" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘L" id="fUB-rF-7x8">
+                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
                         <connections>
-                            <binding destination="-2" name="hidden" keyPath="showVersionContainer" id="NfE-Qx-UMh">
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="b3W-u1-1A2">
                                 <dictionary key="options">
                                     <string key="NSValueTransformerName">NSNegateBoolean</string>
                                 </dictionary>
                             </binding>
-                        </connections>
-                    </stackView>
-                    <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6II-KA-cNi" userLabel="Counter Container">
-                        <rect key="frame" x="307" y="46" width="28" height="22"/>
-                        <subviews>
-                            <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XgA-Vl-CKh" userLabel="Counter Stepper">
-                                <rect key="frame" x="-3" y="-3" width="19" height="27"/>
-                                <shadow key="shadow">
-                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                                </shadow>
-                                <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="ikF-n4-xiI"/>
-                                <connections>
-                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.counter" id="qmm-6z-boy"/>
-                                </connections>
-                            </stepper>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NvO-kt-eZ2" userLabel="Counter Field">
-                                <rect key="frame" x="19" y="3" width="11" height="19"/>
-                                <shadow key="shadow" blurRadius="0.5">
-                                    <size key="offset" width="0.0" height="1"/>
-                                    <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                                </shadow>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1" id="dhQ-bJ-rn3">
-                                    <font key="font" size="12" name="HelveticaNeue-Medium"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
-                                </textFieldCell>
-                                <connections>
-                                    <binding destination="mcS-ik-b0n" name="value" keyPath="selection.counter" id="aA9-yw-cYE"/>
-                                </connections>
-                            </textField>
-                        </subviews>
-                        <visibilityPriorities>
-                            <integer value="1000"/>
-                            <integer value="1000"/>
-                        </visibilityPriorities>
-                        <customSpacing>
-                            <real value="3.4028234663852886e+38"/>
-                            <real value="3.4028234663852886e+38"/>
-                        </customSpacing>
-                        <connections>
-                            <binding destination="mcS-ik-b0n" name="hidden" keyPath="canRemove" id="9vk-TH-Bm2">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="selection.generated" previousBinding="9vk-TH-Bm2" id="B6u-H8-b9o">
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="b3W-u1-1A2" id="gTg-Go-ELg">
                                 <dictionary key="options">
                                     <integer key="NSMultipleValuesPlaceholder" value="-1"/>
                                     <integer key="NSNoSelectionPlaceholder" value="-1"/>
@@ -974,66 +1060,142 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                 </dictionary>
                             </binding>
                         </connections>
-                    </stackView>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9b3-wy-KBb">
+                        <rect key="frame" x="255" y="2" width="23" height="14"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘T" id="HFM-Bk-akx">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="CG8-3H-uiD">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="CG8-3H-uiD" id="n0n-ZB-u5H">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qal-PP-YtO">
+                        <rect key="frame" x="528" y="1" width="23" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘D" id="PPC-be-w4E">
+                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="pgW-yB-Zx3">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="pgW-yB-Zx3" id="XHu-Py-efU">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qLF-A6-ThX">
+                        <rect key="frame" x="415.5" y="1" width="23" height="15"/>
+                        <shadow key="shadow" blurRadius="0.5">
+                            <size key="offset" width="0.0" height="1"/>
+                            <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
+                        </shadow>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="⌘S" id="qh6-k2-MUr">
+                            <font key="font" size="11" name="HelveticaNeue"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="mcS-ik-b0n" name="hidden2" keyPath="canRemove" previousBinding="Eb1-8M-pWd" id="HJi-WD-jkv">
+                                <dictionary key="options">
+                                    <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                    <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                    <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                    <integer key="NSNullPlaceholder" value="-1"/>
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                            <binding destination="-2" name="hidden" keyPath="alternatePressed" id="Eb1-8M-pWd">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
                 </subviews>
                 <constraints>
                     <constraint firstItem="eRe-Ef-AZx" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="1Ar-vS-kS1"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="top" secondItem="iGR-wo-ual" secondAttribute="top" id="1iV-OU-5Ay"/>
-                    <constraint firstItem="brI-fg-Kav" firstAttribute="centerX" secondItem="vES-W5-m4x" secondAttribute="centerX" id="1tN-p4-2m4"/>
-                    <constraint firstItem="Ido-NQ-3MY" firstAttribute="top" secondItem="1Qo-iG-CQt" secondAttribute="bottom" constant="4" id="3MM-M7-OKF"/>
-                    <constraint firstItem="XuF-Sp-6JD" firstAttribute="centerX" secondItem="qal-PP-YtO" secondAttribute="centerX" id="7mj-3B-j0X"/>
+                    <constraint firstItem="qLF-A6-ThX" firstAttribute="top" secondItem="whJ-Bw-pr4" secondAttribute="bottom" constant="4" id="28t-Qy-bhD"/>
+                    <constraint firstItem="Ido-NQ-3MY" firstAttribute="centerX" secondItem="1Qo-iG-CQt" secondAttribute="centerX" id="74O-bk-TKU"/>
                     <constraint firstItem="NGk-Io-Buc" firstAttribute="top" secondItem="oSh-Ec-8Nf" secondAttribute="bottom" priority="250" constant="8" symbolic="YES" id="8AC-MT-cz4"/>
-                    <constraint firstItem="vES-W5-m4x" firstAttribute="centerX" secondItem="CnS-iI-dhr" secondAttribute="centerX" id="92S-HP-Vk7"/>
-                    <constraint firstItem="Ido-NQ-3MY" firstAttribute="centerX" secondItem="1Qo-iG-CQt" secondAttribute="centerX" id="99M-8j-9Dt"/>
+                    <constraint firstItem="6II-KA-cNi" firstAttribute="leading" secondItem="luC-0j-BeV" secondAttribute="trailing" constant="4" id="8Us-64-kBH"/>
+                    <constraint firstItem="9b3-wy-KBb" firstAttribute="top" secondItem="vES-W5-m4x" secondAttribute="bottom" constant="4" id="8qu-2D-fIT"/>
                     <constraint firstAttribute="trailing" secondItem="Aue-Zx-6Mf" secondAttribute="trailing" constant="20" symbolic="YES" id="9Pu-34-g2q"/>
-                    <constraint firstItem="6II-KA-cNi" firstAttribute="top" secondItem="Bgn-Ne-fQ7" secondAttribute="bottom" constant="8" symbolic="YES" id="BfS-QZ-MfW"/>
                     <constraint firstItem="CnS-iI-dhr" firstAttribute="top" secondItem="OnR-s6-d4P" secondAttribute="bottom" constant="8" symbolic="YES" id="CGj-SL-Qhp"/>
                     <constraint firstAttribute="trailing" secondItem="NGk-Io-Buc" secondAttribute="trailing" constant="20" symbolic="YES" id="DK5-VZ-db2"/>
-                    <constraint firstItem="vES-W5-m4x" firstAttribute="centerY" secondItem="XuF-Sp-6JD" secondAttribute="centerY" id="DPa-1n-QWJ"/>
-                    <constraint firstItem="6II-KA-cNi" firstAttribute="centerX" secondItem="vES-W5-m4x" secondAttribute="centerX" id="E1B-x0-Xhk"/>
+                    <constraint firstItem="Ido-NQ-3MY" firstAttribute="top" secondItem="1Qo-iG-CQt" secondAttribute="bottom" constant="4" id="DXw-tk-o47"/>
                     <constraint firstAttribute="centerY" secondItem="iGR-wo-ual" secondAttribute="centerY" id="GZE-mX-kjj"/>
-                    <constraint firstItem="Bgn-Ne-fQ7" firstAttribute="centerX" secondItem="dbM-ja-dKO" secondAttribute="centerX" id="HZ3-9P-tHh"/>
+                    <constraint firstItem="gjx-bt-fKM" firstAttribute="centerY" secondItem="Bgn-Ne-fQ7" secondAttribute="centerY" id="Gjx-ig-5Wb"/>
                     <constraint firstAttribute="centerY" secondItem="CnS-iI-dhr" secondAttribute="centerY" id="HjG-vb-3Qg"/>
+                    <constraint firstItem="9b3-wy-KBb" firstAttribute="centerX" secondItem="vES-W5-m4x" secondAttribute="centerX" id="Iyh-4n-2ag"/>
+                    <constraint firstItem="qal-PP-YtO" firstAttribute="centerX" secondItem="XuF-Sp-6JD" secondAttribute="centerX" id="JOx-Uz-uxf"/>
+                    <constraint firstItem="dbM-ja-dKO" firstAttribute="centerX" secondItem="Bgn-Ne-fQ7" secondAttribute="centerX" id="Jvr-iz-ZSQ"/>
                     <constraint firstItem="iGR-wo-ual" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="KNz-B2-qfi"/>
                     <constraint firstAttribute="trailing" secondItem="eRe-Ef-AZx" secondAttribute="trailing" id="KXq-D3-FUM"/>
                     <constraint firstAttribute="trailing" secondItem="iGR-wo-ual" secondAttribute="trailing" constant="20" symbolic="YES" id="LW8-vu-scs"/>
                     <constraint firstItem="Aue-Zx-6Mf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="Lts-go-pIX"/>
                     <constraint firstAttribute="bottom" secondItem="Bme-XK-MMc" secondAttribute="bottom" id="MbE-Oa-J9k"/>
+                    <constraint firstItem="Oy5-B7-hdN" firstAttribute="centerY" secondItem="lW3-2z-cEa" secondAttribute="centerY" id="Mt6-VS-6Zo"/>
+                    <constraint firstItem="Oy5-B7-hdN" firstAttribute="centerX" secondItem="lW3-2z-cEa" secondAttribute="centerX" id="NQu-Jc-cOd"/>
                     <constraint firstItem="CnS-iI-dhr" firstAttribute="centerX" secondItem="npC-Kk-gUM" secondAttribute="centerX" id="O7q-Xc-mx3"/>
                     <constraint firstAttribute="centerX" secondItem="OnR-s6-d4P" secondAttribute="centerX" id="Pun-kD-jgl"/>
-                    <constraint firstItem="gAU-xs-aae" firstAttribute="top" secondItem="Aue-Zx-6Mf" secondAttribute="bottom" constant="4" id="QkM-BN-dOT"/>
+                    <constraint firstItem="gAU-xs-aae" firstAttribute="top" secondItem="Aue-Zx-6Mf" secondAttribute="bottom" id="QkM-BN-dOT"/>
                     <constraint firstAttribute="centerX" secondItem="CnS-iI-dhr" secondAttribute="centerX" id="Qqi-bu-q65"/>
-                    <constraint firstItem="brI-fg-Kav" firstAttribute="top" secondItem="UpZ-rb-NXd" secondAttribute="bottom" constant="4" id="Xc0-lG-4St"/>
-                    <constraint firstItem="6II-KA-cNi" firstAttribute="centerX" secondItem="Bgn-Ne-fQ7" secondAttribute="centerX" id="YH0-Su-oO4"/>
-                    <constraint firstItem="qal-PP-YtO" firstAttribute="top" secondItem="XuF-Sp-6JD" secondAttribute="bottom" constant="4" id="YuB-MK-njZ"/>
+                    <constraint firstItem="pHt-gg-ZNX" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="Wpn-vZ-iqe"/>
+                    <constraint firstAttribute="bottom" secondItem="pHt-gg-ZNX" secondAttribute="bottom" constant="20" id="YJV-bt-uUV"/>
                     <constraint firstItem="NGk-Io-Buc" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="ZVb-SX-b24"/>
-                    <constraint firstItem="1Qo-iG-CQt" firstAttribute="centerY" secondItem="vES-W5-m4x" secondAttribute="centerY" id="ZeK-3S-ZWW"/>
                     <constraint firstAttribute="bottom" secondItem="eRe-Ef-AZx" secondAttribute="bottom" id="a09-Gf-lZe"/>
-                    <constraint firstItem="brI-fg-Kav" firstAttribute="centerX" secondItem="UpZ-rb-NXd" secondAttribute="centerX" id="b9H-8D-b8a"/>
-                    <constraint firstItem="vES-W5-m4x" firstAttribute="top" secondItem="6II-KA-cNi" secondAttribute="bottom" constant="8" symbolic="YES" id="bUR-ak-bXL"/>
+                    <constraint firstItem="qLF-A6-ThX" firstAttribute="centerX" secondItem="whJ-Bw-pr4" secondAttribute="centerX" id="a3q-sg-y5c"/>
+                    <constraint firstItem="Bgn-Ne-fQ7" firstAttribute="top" secondItem="dbM-ja-dKO" secondAttribute="bottom" constant="8" id="aal-W9-xNu"/>
                     <constraint firstAttribute="centerX" secondItem="oSh-Ec-8Nf" secondAttribute="centerX" id="c28-5a-C45"/>
+                    <constraint firstItem="Bgn-Ne-fQ7" firstAttribute="leading" secondItem="gjx-bt-fKM" secondAttribute="trailing" constant="4" id="cF0-IS-7kS"/>
                     <constraint firstItem="oSh-Ec-8Nf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="cUB-xF-1Wr"/>
-                    <constraint firstItem="XuF-Sp-6JD" firstAttribute="leading" secondItem="vES-W5-m4x" secondAttribute="trailing" constant="8" symbolic="YES" id="d43-2g-dap"/>
-                    <constraint firstAttribute="bottom" secondItem="R46-fx-n14" secondAttribute="bottom" constant="20" symbolic="YES" id="djJ-T6-7Rr"/>
+                    <constraint firstItem="luC-0j-BeV" firstAttribute="centerY" secondItem="6II-KA-cNi" secondAttribute="centerY" id="cvi-w7-09W"/>
                     <constraint firstItem="OnR-s6-d4P" firstAttribute="top" relation="greaterThanOrEqual" secondItem="NGk-Io-Buc" secondAttribute="bottom" constant="40" id="dr2-eR-Yup"/>
-                    <constraint firstAttribute="bottom" secondItem="vES-W5-m4x" secondAttribute="bottom" constant="20" symbolic="YES" id="eHI-Tn-bYD"/>
                     <constraint firstItem="rhm-sC-xFS" firstAttribute="top" secondItem="CnS-iI-dhr" secondAttribute="bottom" constant="8" symbolic="YES" id="f1g-ug-BVL"/>
                     <constraint firstItem="CnS-iI-dhr" firstAttribute="centerX" secondItem="rhm-sC-xFS" secondAttribute="centerX" id="gmg-aZ-1Si"/>
                     <constraint firstItem="Bme-XK-MMc" firstAttribute="top" secondItem="rhm-sC-xFS" secondAttribute="bottom" constant="8" symbolic="YES" id="gsL-Ww-yLa"/>
-                    <constraint firstItem="9b3-wy-KBb" firstAttribute="top" secondItem="vES-W5-m4x" secondAttribute="bottom" constant="4" id="hKa-2u-uL3"/>
-                    <constraint firstAttribute="centerX" secondItem="R46-fx-n14" secondAttribute="centerX" id="hvb-7h-xDS"/>
                     <constraint firstItem="Bme-XK-MMc" firstAttribute="centerX" secondItem="CnS-iI-dhr" secondAttribute="centerX" id="i7B-jz-xgm"/>
                     <constraint firstItem="lW3-2z-cEa" firstAttribute="top" secondItem="iGR-wo-ual" secondAttribute="bottom" constant="8" symbolic="YES" id="jg5-h1-0Gn"/>
-                    <constraint firstItem="vES-W5-m4x" firstAttribute="leading" secondItem="1Qo-iG-CQt" secondAttribute="trailing" constant="8" symbolic="YES" id="kTZ-lP-vnR"/>
+                    <constraint firstItem="qal-PP-YtO" firstAttribute="top" secondItem="XuF-Sp-6JD" secondAttribute="bottom" constant="4" id="kUZ-XT-N3H"/>
                     <constraint firstAttribute="centerX" secondItem="iGR-wo-ual" secondAttribute="centerX" id="kXB-yZ-sur"/>
-                    <constraint firstItem="9b3-wy-KBb" firstAttribute="centerX" secondItem="vES-W5-m4x" secondAttribute="centerX" id="leH-oh-7OJ"/>
                     <constraint firstItem="eRe-Ef-AZx" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="pxS-U4-7ak"/>
-                    <constraint firstItem="vES-W5-m4x" firstAttribute="top" secondItem="brI-fg-Kav" secondAttribute="bottom" constant="8" symbolic="YES" id="rCP-oh-rWr"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="trailing" secondItem="iGR-wo-ual" secondAttribute="trailing" id="rIx-cQ-PNt"/>
-                    <constraint firstItem="uol-dE-I8H" firstAttribute="centerY" secondItem="brI-fg-Kav" secondAttribute="centerY" id="u7f-S8-wNq"/>
                     <constraint firstItem="lW3-2z-cEa" firstAttribute="centerX" secondItem="iGR-wo-ual" secondAttribute="centerX" id="vML-2u-shw"/>
-                    <constraint firstItem="Bgn-Ne-fQ7" firstAttribute="top" secondItem="dbM-ja-dKO" secondAttribute="bottom" constant="8" symbolic="YES" id="wb6-bk-HwO"/>
-                    <constraint firstItem="uol-dE-I8H" firstAttribute="leading" secondItem="brI-fg-Kav" secondAttribute="trailing" constant="8" symbolic="YES" id="wjM-05-gD1"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="bottom" secondItem="iGR-wo-ual" secondAttribute="bottom" id="xiX-8e-pNR"/>
                     <constraint firstItem="v80-wd-hUR" firstAttribute="leading" secondItem="iGR-wo-ual" secondAttribute="leading" id="yVZ-Ar-5ov"/>
                     <constraint firstItem="gAU-xs-aae" firstAttribute="centerX" secondItem="Aue-Zx-6Mf" secondAttribute="centerX" id="yxU-bl-dmQ"/>
@@ -1048,17 +1210,17 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                 <binding destination="-2" name="contentArray" keyPath="sites" id="c96-Dv-HK1"/>
             </connections>
         </arrayController>
-        <box autoresizesSubviews="NO" title="Password Types" borderType="line" titlePosition="noTitle" id="bZe-7q-i6q">
-            <rect key="frame" x="0.0" y="0.0" width="416" height="250"/>
+        <box autoresizesSubviews="NO" title="Choose a password type for apple.com:" borderType="line" id="bZe-7q-i6q">
+            <rect key="frame" x="0.0" y="0.0" width="416" height="254"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <view key="contentView" id="hAc-y9-IMT">
-                <rect key="frame" x="1" y="1" width="414" height="248"/>
+                <rect key="frame" x="1" y="1" width="414" height="238"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autorecalculatesCellSize="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3fr-Fd-pxx">
-                        <rect key="frame" x="18" y="78" width="378" height="158"/>
+                        <rect key="frame" x="10" y="75" width="394" height="158"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        <size key="cellSize" width="177" height="18"/>
+                        <size key="cellSize" width="394" height="18"/>
                         <size key="intercellSpacing" width="4" height="2"/>
                         <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="RW9-c9-I7v">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -1066,27 +1228,27 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </buttonCell>
                         <cells>
                             <column>
-                                <buttonCell type="radio" title="7486" imagePosition="left" alignment="left" tag="1" inset="2" id="QMg-MG-Ytg">
+                                <buttonCell type="radio" title="7486 – PIN" imagePosition="left" alignment="left" tag="1" inset="2" id="QMg-MG-Ytg">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
-                                <buttonCell type="radio" title="Qux6" imagePosition="left" alignment="left" inset="2" id="KD6-NE-8e3">
+                                <buttonCell type="radio" title="Qux6 – Short" imagePosition="left" alignment="left" inset="2" id="KD6-NE-8e3">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
-                                <buttonCell type="radio" title="FIN60WCH" imagePosition="left" alignment="left" inset="2" id="e5D-HK-fHj">
+                                <buttonCell type="radio" title="FIN60WCH – Basic" imagePosition="left" alignment="left" inset="2" id="e5D-HK-fHj">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
-                                <buttonCell type="radio" title="Qux6%Geg" imagePosition="left" alignment="left" inset="2" id="d0t-34-7Fx">
+                                <buttonCell type="radio" title="Qux6%Geg – Medium" imagePosition="left" alignment="left" inset="2" id="d0t-34-7Fx">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
-                                <buttonCell type="radio" title="QuxmDapiJiln3," imagePosition="left" alignment="left" inset="2" id="WD9-cz-7XK">
+                                <buttonCell type="radio" title="QuxmDapiJiln3, – Long" imagePosition="left" alignment="left" state="on" inset="2" id="WD9-cz-7XK">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
-                                <buttonCell type="radio" title="F4*DVMC^zs1fEXfCwRyV" imagePosition="left" alignment="left" inset="2" id="mn3-kQ-wzW">
+                                <buttonCell type="radio" title="F4*DVMC^zs1fEXfCwRyV – Maximum Security" imagePosition="left" alignment="left" inset="2" id="mn3-kQ-wzW">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -1102,7 +1264,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </cells>
                     </matrix>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kCO-1M-Wz1">
-                        <rect key="frame" x="16" y="14" width="382" height="56"/>
+                        <rect key="frame" x="16" y="11" width="382" height="56"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="kl0-P1-6ZY">
                             <font key="font" metaFont="toolTip"/>
                             <string key="title">"Personal password" allows you to store your own password.  It cannot be regenerated in the event of loss.  "Device private password" is similar but will never leave your device: it cannot be synced, backed up or exported.</string>
@@ -1114,15 +1276,17 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
             </view>
             <constraints>
                 <constraint firstItem="kCO-1M-Wz1" firstAttribute="top" secondItem="3fr-Fd-pxx" secondAttribute="bottom" constant="8" symbolic="YES" id="GSx-ci-oqR"/>
-                <constraint firstAttribute="bottom" secondItem="kCO-1M-Wz1" secondAttribute="bottom" constant="11" id="bX0-Xq-QoP"/>
+                <constraint firstAttribute="bottom" secondItem="kCO-1M-Wz1" secondAttribute="bottom" constant="8" id="bX0-Xq-QoP"/>
                 <constraint firstAttribute="trailing" secondItem="kCO-1M-Wz1" secondAttribute="trailing" constant="16" id="dJ5-aO-i4k"/>
-                <constraint firstAttribute="trailing" secondItem="3fr-Fd-pxx" secondAttribute="trailing" constant="16" id="fMC-mZ-q4h"/>
-                <constraint firstItem="3fr-Fd-pxx" firstAttribute="top" secondItem="bZe-7q-i6q" secondAttribute="top" constant="11" id="s28-o1-Mn5"/>
-                <constraint firstItem="3fr-Fd-pxx" firstAttribute="leading" secondItem="bZe-7q-i6q" secondAttribute="leading" constant="16" id="w0i-lL-lPE"/>
+                <constraint firstAttribute="trailing" secondItem="3fr-Fd-pxx" secondAttribute="trailing" constant="8" id="fMC-mZ-q4h"/>
+                <constraint firstItem="3fr-Fd-pxx" firstAttribute="top" secondItem="bZe-7q-i6q" secondAttribute="top" constant="20" id="s28-o1-Mn5"/>
+                <constraint firstItem="3fr-Fd-pxx" firstAttribute="leading" secondItem="bZe-7q-i6q" secondAttribute="leading" constant="8" id="w0i-lL-lPE"/>
                 <constraint firstItem="kCO-1M-Wz1" firstAttribute="leading" secondItem="bZe-7q-i6q" secondAttribute="leading" constant="16" id="wBb-UE-BfN"/>
             </constraints>
             <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
             <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <font key="titleFont" metaFont="message" size="11"/>
+            <point key="canvasLocation" x="447" y="387"/>
         </box>
     </objects>
 </document>
diff --git a/MasterPassword/ObjC/Mac/MPSiteModel.m b/MasterPassword/ObjC/Mac/MPSiteModel.m
index 54eb5f8c..208fdec9 100644
--- a/MasterPassword/ObjC/Mac/MPSiteModel.m
+++ b/MasterPassword/ObjC/Mac/MPSiteModel.m
@@ -168,6 +168,15 @@
         [self updateContent];
 }
 
+- (void)setQuestion:(NSString *)question {
+
+    if ([question isEqualToString:_question])
+        return;
+    _question = question;
+
+    [self updateContent];
+}
+
 - (BOOL)outdated {
 
     return self.algorithmVersion < MPAlgorithmVersionCurrent;