Fixed pull-down, added sections for settings and logs.

External/Pearl

@@ -1 +1 @@
-Subproject commit d4bbb48f21af0323f887d8c869db90951e1f14f6
+Subproject commit 76449ca7a47814189ffffd7f34053c390085d7d2

MasterPassword/ObjC/iOS/MPAppSettingsViewController.h

@@ -0,0 +1,23 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPAppSettingsViewController.h
+//  MPAppSettingsViewController
+//
+//  Created by lhunath on 2014-04-18.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "IASKAppSettingsViewController.h"
+
+@interface MPAppSettingsViewController : IASKAppSettingsViewController
+@end

MasterPassword/ObjC/iOS/MPAppSettingsViewController.m

@@ -0,0 +1,63 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPAppSettingsViewController.h
+//  MPAppSettingsViewController
+//
+//  Created by lhunath on 2014-04-18.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import "MPAppSettingsViewController.h"
+#import "UIColor+Expanded.h"
+
+@interface MPTableView:UITableView
+@end
+
+@implementation MPTableView
+
+- (void)layoutSubviews {
+
+    [super layoutSubviews];
+}
+
+- (void)setContentInset:(UIEdgeInsets)contentInset {
+
+    [super setContentInset:contentInset];
+}
+
+@end
+
+@implementation MPAppSettingsViewController {
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+
+    [super viewWillAppear:animated];
+
+    self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 );
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+    UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+    cell.backgroundColor = [UIColor clearColor];
+    cell.textLabel.textColor = [UIColor whiteColor];
+
+    if (cell.selectionStyle != UITableViewCellSelectionStyleNone) {
+        cell.selectedBackgroundView = [[UIView alloc] initWithFrame:cell.bounds];
+        cell.selectedBackgroundView.backgroundColor = [UIColor colorWithRGBAHex:0x78DDFB33];
+    }
+
+    return cell;
+}
+
+@end

MasterPassword/ObjC/iOS/MPElementListSearchController.m

@@ -105,7 +105,7 @@
 
     UISearchBar *searchBar = self.searchDisplayController.searchBar;
     CGRect searchBarFrame = searchBar.frame;
-    [searchBar.superview enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
+    [searchBar.superview enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
 
         if ([subview isKindOfClass:[UIControl class]] &&
             CGPointEqualToPoint(

MasterPassword/ObjC/iOS/MPLogsViewController.m

@@ -28,12 +28,12 @@
 
     [super viewDidLoad];
 
+    self.view.backgroundColor = [UIColor clearColor];
+
     [[NSNotificationCenter defaultCenter] addObserverForName:NSUserDefaultsDidChangeNotification object:nil
-                                                       queue:nil usingBlock:
+                                                       queue:[NSOperationQueue mainQueue] usingBlock:
             ^(NSNotification *note) {
-                dispatch_async( dispatch_get_main_queue(), ^{
                 self.levelControl.selectedSegmentIndex = [[MPiOSConfig get].traceMode boolValue]? 1: 0;
-                } );
             }];
 }
 
@@ -41,6 +41,8 @@
 
     [super viewWillAppear:animated];
 
+    self.logView.contentInset = UIEdgeInsetsMake( 64, 0, 93, 0 );
+
     [self refresh:nil];
 
     self.levelControl.selectedSegmentIndex = [[MPiOSConfig get].traceMode boolValue]? 1: 0;

MasterPassword/ObjC/iOS/MPPasswordsViewController.h

@@ -23,16 +23,21 @@
 
 @property(strong, nonatomic) IBOutlet UIView *passwordSelectionContainer;
 @property(strong, nonatomic) IBOutlet UICollectionView *passwordCollectionView;
-@property (strong, nonatomic) IBOutlet UISearchBar *passwordsSearchBar;
+@property(strong, nonatomic) IBOutlet UISearchBar *passwordsSearchBar;
-@property (strong, nonatomic) IBOutlet NSLayoutConstraint *passwordsToBottomConstraint;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint *passwordsToBottomConstraint;
-@property (strong, nonatomic) IBOutlet NSLayoutConstraint *navigationBarToTopConstraint;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint *navigationBarToTopConstraint;
-@property (strong, nonatomic) IBOutlet NSLayoutConstraint *navigationBarToPasswordsConstraint;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint *navigationBarToPasswordsConstraint;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint *popdownToTopConstraint;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint *popdownToNavigationBarConstraint;
+@property(strong, nonatomic) IBOutlet UIView *popdownView;
+@property(strong, nonatomic) IBOutlet UIView *popdownContainer;
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *actionBarButton;
 
 @property(assign, nonatomic) BOOL active;
 
 @property(nonatomic, copy) NSString *originalQuery;
 - (void)setActive:(BOOL)active animated:(BOOL)animated completion:(void (^)(BOOL finished))completion;
 
-- (IBAction)action:(id)sender;
+- (IBAction)dismissPopdown:(id)sender;
 
 @end

MasterPassword/ObjC/iOS/MPPasswordsViewController.m

@@ -23,6 +23,7 @@
 #import "MPPasswordTypesCell.h"
 #import "MPPasswordSmallCell.h"
 #import "UIColor+Expanded.h"
+#import "MPPopdownSegue.h"
 
 @interface MPPasswordsViewController()<NSFetchedResultsControllerDelegate>
 
@@ -41,8 +42,11 @@
     NSMutableDictionary *_fetchedUpdates;
     UIColor *_backgroundColor;
     UIColor *_darkenedBackgroundColor;
+    __weak UIViewController *_popdownVC;
 }
 
+#pragma mark - Life
+
 - (void)viewDidLoad {
 
     [super viewDidLoad];
@@ -52,6 +56,8 @@
 
     self.view.backgroundColor = [UIColor clearColor];
     [self.passwordCollectionView automaticallyAdjustInsetsForKeyboard];
+
+    [self.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -71,6 +77,12 @@
     [self stopObservingStore];
 }
 
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+
+    if ([segue.identifier isEqualToString:@"popdown"])
+        _popdownVC = segue.destinationViewController;
+}
+
 #pragma mark - UICollectionViewDelegateFlowLayout
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout
@@ -182,12 +194,12 @@
 
     [element resolveContentUsingKey:[MPAppDelegate_Shared get].key result:^(NSString *result) {
         if (![result length]) {
-            PearlMainQueue(^{
+            PearlMainQueue( ^{
                 NSIndexPath *indexPath_ = [collectionView indexPathForCell:cell];
                 [collectionView selectItemAtIndexPath:indexPath_ animated:NO
                                        scrollPosition:UICollectionViewScrollPositionCenteredHorizontally];
                 [collectionView deselectItemAtIndexPath:indexPath_ animated:YES];
-            });
+            } );
             return;
         }
 
@@ -575,46 +587,12 @@
 
 #pragma mark - Actions
 
-- (IBAction)action:(id)sender {
+- (IBAction)dismissPopdown:(id)sender {
 
-    [PearlSheet showSheetWithTitle:nil viewStyle:UIActionSheetStyleAutomatic
+    if (_popdownVC)
-                         initSheet:nil tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
+        [[[MPPopdownSegue alloc] initWithIdentifier:@"unwind-popdown" source:_popdownVC destination:self] perform];
-        if (buttonIndex == [sheet cancelButtonIndex])
+    else
-            return;
+        self.popdownToTopConstraint.priority = UILayoutPriorityDefaultHigh;
-
-        switch (buttonIndex - [sheet firstOtherButtonIndex]) {
-            case 0: {
-                inf(@"Action: Guide");
-                [[MPiOSAppDelegate get] showGuide];
-                break;
-            }
-            case 1: {
-                inf(@"Action: Preferences");
-                [self performSegueWithIdentifier:@"MP_UserProfile" sender:self];
-                break;
-            }
-            case 2: {
-                inf(@"Action: Other Apps");
-                [self performSegueWithIdentifier:@"MP_OtherApps" sender:self];
-                break;
-            }
-            case 3: {
-                inf(@"Action: Feedback via Mail");
-                [[MPiOSAppDelegate get] showFeedbackWithLogs:YES forVC:self];
-                break;
-            }
-            default: {
-                wrn(@"Unsupported action: %ld", (long)(buttonIndex - [sheet firstOtherButtonIndex]));
-                break;
-            }
-        }
-    }
-                       cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil otherTitles:
-            @"Overview",
-            @"User Profile",
-            @"Other Apps",
-            @"Feedback",
-            nil];
 }
 
 @end

MasterPassword/ObjC/iOS/MPPopdownSegue.h

@@ -0,0 +1,22 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPPopdownSegue.h
+//  MPPopdownSegue
+//
+//  Created by lhunath on 2014-04-17.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface MPPopdownSegue : UIStoryboardSegue
+@end

MasterPassword/ObjC/iOS/MPPopdownSegue.m

@@ -0,0 +1,71 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPPopdownSegue.h
+//  MPPopdownSegue
+//
+//  Created by lhunath on 2014-04-17.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import "MPPopdownSegue.h"
+#import "MPPasswordsViewController.h"
+
+@implementation MPPopdownSegue {
+}
+
+- (void)perform {
+
+    MPPasswordsViewController *passwordsVC;
+    UIViewController *popdownVC;
+    if ([self.sourceViewController isKindOfClass:[MPPasswordsViewController class]]) {
+        passwordsVC = self.sourceViewController;
+        popdownVC = self.destinationViewController;
+        UIView *popdownView = popdownVC.view;
+        popdownView.translatesAutoresizingMaskIntoConstraints = NO;
+
+        [passwordsVC addChildViewController:popdownVC];
+        [passwordsVC.popdownContainer addSubview:popdownView];
+        [passwordsVC.popdownContainer addConstraintsWithVisualFormats:@[ @"H:|[popdownView]|", @"V:|[popdownView]|" ] options:0
+                                                              metrics:nil views:NSDictionaryOfVariableBindings(popdownView)];
+
+        [UIView animateWithDuration:0.3f animations:^{
+            passwordsVC.popdownToTopConstraint.priority = 1;
+            passwordsVC.popdownToNavigationBarConstraint.priority = UILayoutPriorityDefaultHigh;
+
+            [passwordsVC.popdownToNavigationBarConstraint apply];
+            [passwordsVC.popdownToTopConstraint apply];
+        }                completion:^(BOOL finished) {
+            if (finished)
+                [popdownVC didMoveToParentViewController:passwordsVC];
+        }];
+    }
+    else if ([self.destinationViewController isKindOfClass:[MPPasswordsViewController class]]) {
+        popdownVC = self.sourceViewController;
+        passwordsVC = self.destinationViewController;
+
+        [popdownVC willMoveToParentViewController:nil];
+        [UIView animateWithDuration:0.3f delay:0 options:UIViewAnimationOptionOverrideInheritedDuration animations:^{
+            passwordsVC.popdownToTopConstraint.priority = UILayoutPriorityDefaultHigh;
+            passwordsVC.popdownToNavigationBarConstraint.priority = 1;
+
+            [passwordsVC.popdownToNavigationBarConstraint apply];
+            [passwordsVC.popdownToTopConstraint apply];
+        }                completion:^(BOOL finished) {
+            if (finished) {
+                [popdownVC.view removeFromSuperview];
+                [popdownVC removeFromParentViewController];
+            }
+        }];
+    }
+}
+
+@end

MasterPassword/ObjC/iOS/MPPreferencesViewController.h

@@ -9,15 +9,16 @@
 #import <UIKit/UIKit.h>
 #import "MPTypeViewController.h"
 
-@interface MPPreferencesViewController : UITableViewController<MPTypeDelegate>
+@interface MPPreferencesViewController : UITableViewController
 
-@property(weak, nonatomic) IBOutlet UIScrollView *avatarsView;
-@property(weak, nonatomic) IBOutlet UIButton *avatarTemplate;
 @property(weak, nonatomic) IBOutlet UISwitch *savePasswordSwitch;
+@property(weak, nonatomic) IBOutlet UITableViewCell *feedbackCell;
 @property(weak, nonatomic) IBOutlet UITableViewCell *exportCell;
-@property(weak, nonatomic) IBOutlet UITableViewCell *changeMPCell;
+@property(weak, nonatomic) IBOutlet UIImageView *avatarImage;
-@property(weak, nonatomic) IBOutlet UILabel *defaultTypeLabel;
+@property(weak, nonatomic) IBOutlet UISegmentedControl *typeControl;
 
-- (IBAction)didToggleSwitch:(UISwitch *)sender;
+- (IBAction)previousAvatar:(id)sender;
+- (IBAction)nextAvatar:(id)sender;
+- (IBAction)valueChanged:(id)sender;
 
 @end

MasterPassword/ObjC/iOS/MPPreferencesViewController.m

@@ -6,12 +6,11 @@
 //  Copyright (c) 2012 Lyndir. All rights reserved.
 //
 
-#import <QuartzCore/QuartzCore.h>
-
 #import "MPPreferencesViewController.h"
 #import "MPiOSAppDelegate.h"
 #import "MPAppDelegate_Key.h"
 #import "MPAppDelegate_Store.h"
+#import "UIColor+Expanded.h"
 
 @interface MPPreferencesViewController()
 
@@ -21,158 +20,135 @@
 
 - (void)viewDidLoad {
 
-    self.avatarTemplate.hidden = YES;
-
-    for (NSUInteger a = 0; a < MPAvatarCount; ++a) {
-        UIButton *avatar = [self.avatarTemplate clone];
-        avatar.tag = a;
-        avatar.hidden = NO;
-        avatar.center = CGPointMake(
-                self.avatarTemplate.center.x * (a + 1) + self.avatarTemplate.bounds.size.width / 2 * a,
-                self.avatarTemplate.center.y );
-        [avatar setBackgroundImage:[UIImage imageNamed:PearlString( @"avatar-%ld", (long)a )]
-                          forState:UIControlStateNormal];
-        [avatar setSelectionInSuperviewCandidate:YES isClearable:NO];
-
-        avatar.layer.cornerRadius = avatar.bounds.size.height / 2;
-        avatar.layer.shadowColor = [UIColor blackColor].CGColor;
-        avatar.layer.shadowOpacity = 1;
-        avatar.layer.shadowRadius = 5;
-        avatar.backgroundColor = [UIColor clearColor];
-
-        [avatar onHighlightOrSelect:^(BOOL highlighted, BOOL selected) {
-            if (highlighted || selected)
-                avatar.backgroundColor = self.avatarTemplate.backgroundColor;
-            else
-                avatar.backgroundColor = [UIColor clearColor];
-        }                   options:0];
-        [avatar onSelect:^(BOOL selected) {
-            if (selected) {
-                [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
-                    [[MPiOSAppDelegate get] activeUserInContext:moc].avatar = (unsigned)avatar.tag;
-                    [moc saveToStore];
-                }];
-            }
-        }        options:0];
-        avatar.selected = (a == [[MPiOSAppDelegate get] activeUserForMainThread].avatar);
-    }
-
     [super viewDidLoad];
+
+    self.view.backgroundColor = [UIColor clearColor];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
 
     inf(@"Preferences will appear");
-    [self.avatarsView autoSizeContent];
+    [super viewWillAppear:animated];
-    [self.avatarsView enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
-        if (subview.tag && ((UIControl *)subview).selected) {
-            [self.avatarsView setContentOffset:CGPointMake( subview.center.x - self.avatarsView.bounds.size.width / 2, 0 )
-                                      animated:animated];
-        }
-    }                           recurse:NO];
 
     MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserForMainThread];
+    self.typeControl.selectedSegmentIndex = [self segmentIndexForType:activeUser.defaultType];
+    self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%ld", (long)activeUser.avatar )];
     self.savePasswordSwitch.on = activeUser.saveKey;
-    self.defaultTypeLabel.text = [[MPiOSAppDelegate get].key.algorithm shortNameOfType:activeUser.defaultType];
 
-    [super viewWillAppear:animated];
+    self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 );
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-
-#ifdef LOCALYTICS
-    [[LocalyticsSession sharedLocalyticsSession] tagScreen:@"Preferences"];
-#endif
-
-    [super viewDidAppear:animated];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-
-    inf(@"Preferences will disappear");
-    [super viewWillDisappear:animated];
-}
-
-- (BOOL)canBecomeFirstResponder {
-
-    return YES;
-}
-
-- (void)motionEnded:(UIEventSubtype)motion withEvent:(UIEvent *)event {
-
-    if (motion == UIEventSubtypeMotionShake) {
-        MPCheckpoint( MPCheckpointLogs, @{
-                @"trace" : [MPiOSConfig get].traceMode
-        } );
-        [self performSegueWithIdentifier:@"MP_Logs" sender:self];
-    }
-}
-
-- (BOOL)shouldAutorotate {
-
-    return NO;
-}
-
-- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
-
-    return UIInterfaceOrientationPortrait;
-}
-
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-
-    if ([[segue identifier] isEqualToString:@"MP_ChooseType"])
-        ((MPTypeViewController *)[segue destinationViewController]).delegate = self;
 }
 
 #pragma mark - UITableViewDelegate
 
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+    UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
+    if (cell.selectionStyle != UITableViewCellSelectionStyleNone) {
+        cell.selectedBackgroundView = [[UIView alloc] initWithFrame:cell.bounds];
+        cell.selectedBackgroundView.backgroundColor = [UIColor colorWithRGBAHex:0x78DDFB33];
+    }
+
+    return cell;
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
 
     UITableViewCell *cell = [self tableView:tableView cellForRowAtIndexPath:indexPath];
     if (cell == self.exportCell)
         [[MPiOSAppDelegate get] export];
 
-    else if (cell == self.changeMPCell) {
-        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
-            MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:moc];
-            [[MPiOSAppDelegate get] changeMasterPasswordFor:activeUser saveInContext:moc didResetBlock:nil];
-        }];
-    }
-
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
-#pragma mark - MPTypeDelegate
-
-- (void)didSelectType:(MPElementType)type {
-
-    self.defaultTypeLabel.text = [[MPiOSAppDelegate get].key.algorithm shortNameOfType:type];
-
-    [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-        MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:context];
-        activeUser.defaultType = type;
-        [context saveToStore];
-    }];
-}
-
-- (MPElementType)selectedType {
-
-    return [[MPiOSAppDelegate get] activeUserForMainThread].defaultType;
-}
-
 #pragma mark - IBActions
 
-- (IBAction)didToggleSwitch:(UISwitch *)sender {
+- (IBAction)valueChanged:(id)sender {
 
     if (sender == self.savePasswordSwitch)
-        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-            MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:moc];
+            MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:context];
-            if ((activeUser.saveKey = sender.on))
+            if ((activeUser.saveKey = self.savePasswordSwitch.on))
                 [[MPiOSAppDelegate get] storeSavedKeyFor:activeUser];
             else
                 [[MPiOSAppDelegate get] forgetSavedKeyFor:activeUser];
-            [moc saveToStore];
+            [context saveToStore];
+        }];
+
+    if (sender == self.typeControl)
+        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+            [[MPiOSAppDelegate get] activeUserInContext:context].defaultType = [self typeForSelectedSegment];
+            [context saveToStore];
         }];
 }
 
+- (IBAction)previousAvatar:(id)sender {
+
+    [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+        MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:context];
+        activeUser.avatar = (activeUser.avatar - 1 + MPAvatarCount) % MPAvatarCount;
+        [context saveToStore];
+
+        long avatar = activeUser.avatar;
+        PearlMainQueue( ^{
+            self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%ld", avatar )];
+        } );
+    }];
+}
+
+- (IBAction)nextAvatar:(id)sender {
+
+    [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+        MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:context];
+        activeUser.avatar = (activeUser.avatar + 1 + MPAvatarCount) % MPAvatarCount;
+        [context saveToStore];
+
+        long avatar = activeUser.avatar;
+        PearlMainQueue( ^{
+            self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%ld", avatar )];
+        } );
+    }];
+}
+
+#pragma mark - Private
+
+- (enum MPElementType)typeForSelectedSegment {
+
+    switch (self.typeControl.selectedSegmentIndex) {
+        case 0:
+            return MPElementTypeGeneratedMaximum;
+        case 1:
+            return MPElementTypeGeneratedLong;
+        case 2:
+            return MPElementTypeGeneratedMedium;
+        case 3:
+            return MPElementTypeGeneratedBasic;
+        case 4:
+            return MPElementTypeGeneratedShort;
+        case 5:
+            return MPElementTypeGeneratedPIN;
+        default:
+            Throw(@"Unsupported type index: %ld", (long)self.typeControl.selectedSegmentIndex);
+    }
+}
+
+- (NSInteger)segmentIndexForType:(MPElementType)type {
+
+    switch (type) {
+        case MPElementTypeGeneratedMaximum:
+            return 0;
+        case MPElementTypeGeneratedLong:
+            return 1;
+        case MPElementTypeGeneratedMedium:
+            return 2;
+        case MPElementTypeGeneratedBasic:
+            return 3;
+        case MPElementTypeGeneratedShort:
+            return 4;
+        case MPElementTypeGeneratedPIN:
+            return 5;
+        default:
+            Throw(@"Unsupported type index: %ld", (long)self.typeControl.selectedSegmentIndex);
+    }
+}
+
 @end

MasterPassword/ObjC/iOS/MPPreferencesViewControllerOld.h

@@ -0,0 +1,23 @@
+//
+//  MPPreferencesViewController.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 04/06/12.
+//  Copyright (c) 2012 Lyndir. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "MPTypeViewController.h"
+
+@interface MPPreferencesViewControllerOld : UITableViewController<MPTypeDelegate>
+
+@property(weak, nonatomic) IBOutlet UIScrollView *avatarsView;
+@property(weak, nonatomic) IBOutlet UIButton *avatarTemplate;
+@property(weak, nonatomic) IBOutlet UISwitch *savePasswordSwitch;
+@property(weak, nonatomic) IBOutlet UITableViewCell *exportCell;
+@property(weak, nonatomic) IBOutlet UITableViewCell *changeMPCell;
+@property(weak, nonatomic) IBOutlet UILabel *defaultTypeLabel;
+
+- (IBAction)didToggleSwitch:(UISwitch *)sender;
+
+@end

MasterPassword/ObjC/iOS/MPPreferencesViewControllerOld.m

@@ -0,0 +1,178 @@
+//
+//  MPPreferencesViewController.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 04/06/12.
+//  Copyright (c) 2012 Lyndir. All rights reserved.
+//
+
+#import <QuartzCore/QuartzCore.h>
+
+#import "MPPreferencesViewControllerOld.h"
+#import "MPiOSAppDelegate.h"
+#import "MPAppDelegate_Key.h"
+#import "MPAppDelegate_Store.h"
+
+@interface MPPreferencesViewControllerOld()
+
+@end
+
+@implementation MPPreferencesViewControllerOld
+
+- (void)viewDidLoad {
+
+    self.avatarTemplate.hidden = YES;
+
+    for (NSUInteger a = 0; a < MPAvatarCount; ++a) {
+        UIButton *avatar = [self.avatarTemplate clone];
+        avatar.tag = a;
+        avatar.hidden = NO;
+        avatar.center = CGPointMake(
+                self.avatarTemplate.center.x * (a + 1) + self.avatarTemplate.bounds.size.width / 2 * a,
+                self.avatarTemplate.center.y );
+        [avatar setBackgroundImage:[UIImage imageNamed:PearlString( @"avatar-%ld", (long)a )]
+                          forState:UIControlStateNormal];
+        [avatar setSelectionInSuperviewCandidate:YES isClearable:NO];
+
+        avatar.layer.cornerRadius = avatar.bounds.size.height / 2;
+        avatar.layer.shadowColor = [UIColor blackColor].CGColor;
+        avatar.layer.shadowOpacity = 1;
+        avatar.layer.shadowRadius = 5;
+        avatar.backgroundColor = [UIColor clearColor];
+
+        [avatar onHighlightOrSelect:^(BOOL highlighted, BOOL selected) {
+            if (highlighted || selected)
+                avatar.backgroundColor = self.avatarTemplate.backgroundColor;
+            else
+                avatar.backgroundColor = [UIColor clearColor];
+        }                   options:0];
+        [avatar onSelect:^(BOOL selected) {
+            if (selected) {
+                [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+                    [[MPiOSAppDelegate get] activeUserInContext:moc].avatar = (unsigned)avatar.tag;
+                    [moc saveToStore];
+                }];
+            }
+        }        options:0];
+        avatar.selected = (a == [[MPiOSAppDelegate get] activeUserForMainThread].avatar);
+    }
+
+    [super viewDidLoad];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+
+    inf(@"Preferences will appear");
+    [self.avatarsView autoSizeContent];
+    [self.avatarsView enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
+        if (subview.tag && ((UIControl *)subview).selected) {
+            [self.avatarsView setContentOffset:CGPointMake( subview.center.x - self.avatarsView.bounds.size.width / 2, 0 )
+                                      animated:animated];
+        }
+    }                        recurse:NO];
+
+    MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserForMainThread];
+    self.savePasswordSwitch.on = activeUser.saveKey;
+    self.defaultTypeLabel.text = [[MPiOSAppDelegate get].key.algorithm shortNameOfType:activeUser.defaultType];
+
+    [super viewWillAppear:animated];
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+
+#ifdef LOCALYTICS
+    [[LocalyticsSession sharedLocalyticsSession] tagScreen:@"Preferences"];
+#endif
+
+    [super viewDidAppear:animated];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+
+    inf(@"Preferences will disappear");
+    [super viewWillDisappear:animated];
+}
+
+- (BOOL)canBecomeFirstResponder {
+
+    return YES;
+}
+
+- (void)motionEnded:(UIEventSubtype)motion withEvent:(UIEvent *)event {
+
+    if (motion == UIEventSubtypeMotionShake) {
+        MPCheckpoint( MPCheckpointLogs, @{
+                @"trace" : [MPiOSConfig get].traceMode
+        } );
+        [self performSegueWithIdentifier:@"MP_Logs" sender:self];
+    }
+}
+
+- (BOOL)shouldAutorotate {
+
+    return NO;
+}
+
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
+
+    return UIInterfaceOrientationPortrait;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+
+    if ([[segue identifier] isEqualToString:@"MP_ChooseType"])
+        ((MPTypeViewController *)[segue destinationViewController]).delegate = self;
+}
+
+#pragma mark - UITableViewDelegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+
+    UITableViewCell *cell = [self tableView:tableView cellForRowAtIndexPath:indexPath];
+    if (cell == self.exportCell)
+        [[MPiOSAppDelegate get] export];
+
+    else if (cell == self.changeMPCell) {
+        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+            MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:moc];
+            [[MPiOSAppDelegate get] changeMasterPasswordFor:activeUser saveInContext:moc didResetBlock:nil];
+        }];
+    }
+
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+}
+
+#pragma mark - MPTypeDelegate
+
+- (void)didSelectType:(MPElementType)type {
+
+    self.defaultTypeLabel.text = [[MPiOSAppDelegate get].key.algorithm shortNameOfType:type];
+
+    [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+        MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:context];
+        activeUser.defaultType = type;
+        [context saveToStore];
+    }];
+}
+
+- (MPElementType)selectedType {
+
+    return [[MPiOSAppDelegate get] activeUserForMainThread].defaultType;
+}
+
+#pragma mark - IBActions
+
+- (IBAction)didToggleSwitch:(UISwitch *)sender {
+
+    if (sender == self.savePasswordSwitch)
+        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+            MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:moc];
+            if ((activeUser.saveKey = sender.on))
+                [[MPiOSAppDelegate get] storeSavedKeyFor:activeUser];
+            else
+                [[MPiOSAppDelegate get] forgetSavedKeyFor:activeUser];
+            [moc saveToStore];
+        }];
+}
+
+@end

MasterPassword/ObjC/iOS/MPUnlockViewController.m

@@ -162,7 +162,7 @@
     self.wordList = wordListLines;
 
     self.wordWall.alpha = 0;
-    [self.wordWall enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
+    [self.wordWall enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
         UILabel *wordLabel = (UILabel *)subview;
 
         [self initializeWordLabel:wordLabel];
@@ -585,7 +585,7 @@
         targetedUser = [self userForAvatar:targetedAvatar inContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]];
     }
 
-    [self.avatarsView enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
+    [self.avatarsView enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
         if (![[self.avatarToUserOID allKeys] containsObject:[NSValue valueWithNonretainedObject:subview]])
                 // This subview is not one of the user avatars.
             return;
@@ -617,7 +617,7 @@
 
 - (void)beginWordWallAnimation {
 
-    [self.wordWall enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
+    [self.wordWall enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
         UILabel *wordLabel = (UILabel *)subview;
 
         if (wordLabel.frame.origin.x < -self.wordWall.frame.size.width / 3) {
@@ -628,7 +628,7 @@
 
     if (self.wordWallAnimating)
         [UIView animateWithDuration:15 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
-            [self.wordWall enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
+            [self.wordWall enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
                 UILabel *wordLabel = (UILabel *)subview;
 
                 wordLabel.frame = CGRectSetX( wordLabel.frame, wordLabel.frame.origin.x - self.wordWall.frame.size.width / 3 );

MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
     <dependencies>
         <deployment defaultVersion="1792" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
@@ -2266,7 +2266,7 @@ Only site names and custom passwords are sent to iCloud.  Passwords are encrypte
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                     <color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
                                                     <connections>
-                                                        <action selector="didToggleSwitch:" destination="oLN-6u-GLb" eventType="valueChanged" id="e5q-mf-XK7"/>
+                                                        <action selector="valueChanged:" destination="oLN-6u-GLb" eventType="valueChanged" id="e5q-mf-XK7"/>
                                                     </connections>
                                                 </switch>
                                             </subviews>
@@ -2323,7 +2323,7 @@ Only site names and custom passwords are sent to iCloud.  Passwords are encrypte
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" id="qoQ-x9-XHs">
-                                                    <rect key="frame" x="20" y="0.0" width="280" height="155"/>
+                                                    <rect key="frame" x="19" y="0.0" width="280" height="155"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <string key="text">"Save Password" will store your master password in the keychain.  This means you won't need the master password anymore to log in (unless your device gets restored or you start using a new device). This is somewhat less secure in the event of theft.  You can compensate for the reduced security by going into Settings and navigating: General-&gt;Passcode Lock, disabling "Simple Passcode", and setting a more secure passcode for your device.</string>
                                                     <fontDescription key="fontDescription" name="GillSans-LightItalic" family="Gill Sans" pointSize="14"/>
@@ -2467,7 +2467,7 @@ Only site names and custom passwords are sent to iCloud.  Passwords are encrypte
             <objects>
                 <tableViewController id="Vrp-Gl-7qn" customClass="IASKAppSettingsViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="NCp-ii-ux0">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
@@ -3170,9 +3170,9 @@ However, it means that anyone who finds your device unlocked can do the same.</s
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
+        <segue reference="X2A-e4-krq"/>
+        <segue reference="KIl-ZW-M7G"/>
+        <segue reference="5Im-dm-qfS"/>
         <segue reference="jgo-j3-gbW"/>
-        <segue reference="9Bs-cD-ddF"/>
-        <segue reference="rWT-Kr-cAs"/>
-        <segue reference="hxY-aA-ngI"/>
     </inferredMetricsTieBreakers>
 </document>

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		93D3954FCE045A3CC7E804B7 /* MPUsersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D399E571F61E50A9BF8FAF /* MPUsersViewController.m */; };
 		93D3957237D303DE2D38C267 /* MPAvatarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39B381350802A194BF332 /* MPAvatarCell.m */; };
 		93D395F08A087F8A24689347 /* NSArray+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */; };
+		93D39673DDC085BE72C34D7C /* MPPopdownSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39B050DD5F55E9794EFD4 /* MPPopdownSegue.m */; };
 		93D396AA30690B256F30378A /* PearlNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3956915634581E737B38C /* PearlNavigationController.m */; };
 		93D396BA1C74C4A06FD86437 /* PearlOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D3942A356B639724157982 /* PearlOverlay.h */; };
 		93D397952F5635C793C24DF1 /* NSError+PearlFullDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39F9106F2CCFB94283188 /* NSError+PearlFullDescription.m */; };
@@ -34,9 +35,11 @@
 		93D399BBC0A7EC746CB1B19B /* MPLogsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D391943675426839501BB8 /* MPLogsViewController.h */; };
 		93D39A5FF670957C0AF8298D /* MPPasswordCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39DEA995041A13DC9CAF7 /* MPPasswordCell.m */; };
 		93D39A8EA1C49CE43B63F47B /* PearlUICollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D8A953779B35403AF6E /* PearlUICollectionView.m */; };
+		93D39B21156EC9A0B4C2BC83 /* MPPreferencesViewControllerOld.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D390381D3D3AE241B5D341 /* MPPreferencesViewControllerOld.m */; };
 		93D39B76DD5AB108BA8928E8 /* UIScrollView+PearlAdjustInsets.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39DE2CB351D4E3789462B /* UIScrollView+PearlAdjustInsets.h */; };
 		93D39B842AB9A5D072810D76 /* NSError+PearlFullDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */; };
 		93D39B8F90F58A5D158DDBA3 /* MPPasswordsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3924EE15017F8A12CB436 /* MPPasswordsViewController.m */; };
+		93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */; };
 		93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; };
 		93D39C8AD8EAB747856B3A8C /* LLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3923B42DA2DA18F287092 /* LLModel.m */; };
 		93D39CB5E2EC1078E898F46A /* MPPasswordLargeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3937863061C3916AF7AD2 /* MPPasswordLargeCell.m */; };
@@ -48,6 +51,8 @@
 		93D39F8A9254177891F38705 /* MPSetupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A28369954D147E239BA /* MPSetupViewController.m */; };
 		93D39FA97F4C3F69A75D5A03 /* MPPasswordLargeGeneratedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3993422E207BF0B21D089 /* MPPasswordLargeGeneratedCell.m */; };
 		DA04E33E14B1E70400ECA4F3 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */; };
+		DA071BF3190187FE00179766 /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF1190187FE00179766 /* empty@2x.png */; };
+		DA071BF4190187FE00179766 /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF2190187FE00179766 /* empty.png */; };
 		DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */; };
 		DA2CA4DD18D28859007798F8 /* NSArray+Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2CA4D918D28859007798F8 /* NSArray+Pearl.m */; };
 		DA2CA4DE18D28859007798F8 /* NSArray+Pearl.h in Headers */ = {isa = PBXBuildFile; fileRef = DA2CA4DA18D28859007798F8 /* NSArray+Pearl.h */; };
@@ -67,6 +72,8 @@
 		DA38D6A318CCB5BF009AEB3E /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA38D6A218CCB5BF009AEB3E /* Storyboard.storyboard */; };
 		DA4425CC1557BED40052177D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DA44260A1557D9E40052177D /* libUbiquityStoreManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */; };
+		DA4522441902355C008F650A /* icon_book.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD370C1711E29500CF925C /* icon_book.png */; };
+		DA4522451902355C008F650A /* icon_book@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD370D1711E29500CF925C /* icon_book@2x.png */; };
 		DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
 		DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; };
 		DA5A09DF171A70E4005284AB /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09DD171A70E4005284AB /* play.png */; };
@@ -517,6 +524,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		93D390381D3D3AE241B5D341 /* MPPreferencesViewControllerOld.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPreferencesViewControllerOld.m; sourceTree = "<group>"; };
 		93D390519405B76CC6A57C4F /* MPCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCell.h; sourceTree = "<group>"; };
 		93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Indexing.m"; sourceTree = "<group>"; };
 		93D39097C0AAE62C1C321BFC /* MPPasswordTypesCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordTypesCell.m; sourceTree = "<group>"; };
@@ -525,9 +533,11 @@
 		93D390FB3110DCCE68E600DC /* UIScrollView+PearlAdjustInsets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+PearlAdjustInsets.m"; sourceTree = "<group>"; };
 		93D391243F64A77798B4D6A4 /* MPPasswordTypesCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordTypesCell.h; sourceTree = "<group>"; };
 		93D3914D7597F9A28DB9D85E /* MPPasswordsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordsViewController.h; sourceTree = "<group>"; };
+		93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppSettingsViewController.m; sourceTree = "<group>"; };
 		93D391943675426839501BB8 /* MPLogsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLogsViewController.h; sourceTree = "<group>"; };
 		93D3923B42DA2DA18F287092 /* LLModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LLModel.m; sourceTree = "<group>"; };
 		93D3924EE15017F8A12CB436 /* MPPasswordsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordsViewController.m; sourceTree = "<group>"; };
+		93D392876BE5C011DE73B43F /* MPPopdownSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPopdownSegue.h; sourceTree = "<group>"; };
 		93D3932D6C25F2C2D929F8A1 /* MPPasswordElementCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordElementCell.h; sourceTree = "<group>"; };
 		93D393310223DDB35218467A /* MPCombinedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCombinedViewController.m; sourceTree = "<group>"; };
 		93D39342E5F115EFCC90E976 /* MPPasswordElementCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordElementCell.m; sourceTree = "<group>"; };
@@ -553,6 +563,7 @@
 		93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+PearlFullDescription.h"; sourceTree = "<group>"; };
 		93D398EBF99FF0C245FD561E /* NSManagedObject+Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObject+Pearl.m"; sourceTree = "<group>"; };
 		93D3993422E207BF0B21D089 /* MPPasswordLargeGeneratedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordLargeGeneratedCell.m; sourceTree = "<group>"; };
+		93D39961CD6A43648CC0B0DB /* MPPreferencesViewControllerOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPreferencesViewControllerOld.h; sourceTree = "<group>"; };
 		93D39975CE5AEC99E3F086C7 /* MPPasswordCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordCell.h; sourceTree = "<group>"; };
 		93D399E571F61E50A9BF8FAF /* MPUsersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUsersViewController.m; sourceTree = "<group>"; };
 		93D39A1DDFA09AE2E14D26DC /* UIResponder+PearlFirstResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIResponder+PearlFirstResponder.m"; sourceTree = "<group>"; };
@@ -561,12 +572,14 @@
 		93D39A41340CF778E00D0E6D /* MPEmergencySegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEmergencySegue.h; sourceTree = "<group>"; };
 		93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Indexing.m"; sourceTree = "<group>"; };
 		93D39ACBA9F4878B6A1CC33B /* MPEmergencyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEmergencyViewController.m; sourceTree = "<group>"; };
+		93D39B050DD5F55E9794EFD4 /* MPPopdownSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPopdownSegue.m; sourceTree = "<group>"; };
 		93D39B1D8177A86C5B9EDDE3 /* PearlUICollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlUICollectionView.h; sourceTree = "<group>"; };
 		93D39B381350802A194BF332 /* MPAvatarCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAvatarCell.m; sourceTree = "<group>"; };
 		93D39BA6C5CB452973918B7D /* LLButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LLButtonView.h; sourceTree = "<group>"; };
 		93D39BAA71DE51B4D8A1286C /* MPCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCell.m; sourceTree = "<group>"; };
 		93D39BF6BCBDFFE844E7D34C /* LLButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LLButtonView.m; sourceTree = "<group>"; };
 		93D39C44361BE57AF0B3071F /* MPPasswordsSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordsSegue.h; sourceTree = "<group>"; };
+		93D39C86E984EC65DA5ACB1D /* MPAppSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppSettingsViewController.h; sourceTree = "<group>"; };
 		93D39C8E26B06F01566785B7 /* LLToggleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LLToggleViewController.m; sourceTree = "<group>"; };
 		93D39CDD434AFD6E1B0DA359 /* MPEmergencyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEmergencyViewController.h; sourceTree = "<group>"; };
 		93D39CE1138FDA4D3D1B847A /* MPPasswordLargeGeneratedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordLargeGeneratedCell.h; sourceTree = "<group>"; };
@@ -580,6 +593,8 @@
 		93D39F7C9F47BF6387FBC5C3 /* PearlEMail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlEMail.h; sourceTree = "<group>"; };
 		93D39F9106F2CCFB94283188 /* NSError+PearlFullDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+PearlFullDescription.m"; sourceTree = "<group>"; };
 		DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+		DA071BF1190187FE00179766 /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty@2x.png"; sourceTree = "<group>"; };
+		DA071BF2190187FE00179766 /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree = "<group>"; };
 		DA2CA4D918D28859007798F8 /* NSArray+Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Pearl.m"; sourceTree = "<group>"; };
 		DA2CA4DA18D28859007798F8 /* NSArray+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Pearl.h"; sourceTree = "<group>"; };
 		DA2CA4DB18D28859007798F8 /* NSTimer+PearlBlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+PearlBlock.m"; sourceTree = "<group>"; };
@@ -1720,6 +1735,8 @@
 				93D39DEA995041A13DC9CAF7 /* MPPasswordCell.m */,
 				93D39ACBA9F4878B6A1CC33B /* MPEmergencyViewController.m */,
 				93D39CDD434AFD6E1B0DA359 /* MPEmergencyViewController.h */,
+				93D390381D3D3AE241B5D341 /* MPPreferencesViewControllerOld.m */,
+				93D39961CD6A43648CC0B0DB /* MPPreferencesViewControllerOld.h */,
 			);
 			sourceTree = "<group>";
 		};
@@ -1787,6 +1804,8 @@
 		DABD360D1711E29400CF925C /* Media */ = {
 			isa = PBXGroup;
 			children = (
+				DA071BF1190187FE00179766 /* empty@2x.png */,
+				DA071BF2190187FE00179766 /* empty.png */,
 				DADBB55918DB0CFC00D099FE /* keyboard-dark@2x.png */,
 				DA945C8617E3F3FD0053236B /* Images.xcassets */,
 				DA5E5C3C1723681B003798D8 /* Square-bottom.png */,
@@ -2596,6 +2615,10 @@
 				93D39A41340CF778E00D0E6D /* MPEmergencySegue.h */,
 				93D39E7A12CC352B2825AA66 /* MPPasswordsSegue.m */,
 				93D39C44361BE57AF0B3071F /* MPPasswordsSegue.h */,
+				93D39B050DD5F55E9794EFD4 /* MPPopdownSegue.m */,
+				93D392876BE5C011DE73B43F /* MPPopdownSegue.h */,
+				93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */,
+				93D39C86E984EC65DA5ACB1D /* MPAppSettingsViewController.h */,
 			);
 			path = iOS;
 			sourceTree = "<group>";
@@ -3661,10 +3684,12 @@
 				DABD39021711E29700CF925C /* ui_panel_container@2x.png in Resources */,
 				DABD39031711E29700CF925C /* ui_panel_display.png in Resources */,
 				DABD39041711E29700CF925C /* ui_panel_display@2x.png in Resources */,
+				DA071BF4190187FE00179766 /* empty.png in Resources */,
 				DABD391D1711E29700CF925C /* ui_spinner.png in Resources */,
 				DABD391E1711E29700CF925C /* ui_spinner@2x.png in Resources */,
 				DA69540617D975D900BF294E /* icon_gears.png in Resources */,
 				DA67460D18DE7F0C00DFE240 /* Exo2.0-Thin.otf in Resources */,
+				DA4522451902355C008F650A /* icon_book@2x.png in Resources */,
 				DABD39271711E29700CF925C /* ui_textfield.png in Resources */,
 				DABD39281711E29700CF925C /* ui_textfield@2x.png in Resources */,
 				DABD39291711E29700CF925C /* ui_toolbar_container.png in Resources */,
@@ -3694,6 +3719,7 @@
 				DABD394A1711E29700CF925C /* avatar-18.png in Resources */,
 				DABD394B1711E29700CF925C /* avatar-18@2x.png in Resources */,
 				DABD394C1711E29700CF925C /* avatar-1@2x.png in Resources */,
+				DA071BF3190187FE00179766 /* empty@2x.png in Resources */,
 				DA67460E18DE7F0C00DFE240 /* Exo2.0-Regular.otf in Resources */,
 				DABD394D1711E29700CF925C /* avatar-2.png in Resources */,
 				DABD394E1711E29700CF925C /* avatar-2@2x.png in Resources */,
@@ -3753,6 +3779,7 @@
 				DABD3B571711E29800CF925C /* tip_basic_black_bottom_right@2x.png in Resources */,
 				DABD3B581711E29800CF925C /* tip_basic_black_top.png in Resources */,
 				DABD3B591711E29800CF925C /* tip_basic_black_top@2x.png in Resources */,
+				DA4522441902355C008F650A /* icon_book.png in Resources */,
 				DABD3B5A1711E29800CF925C /* tip_basic_black_top_right.png in Resources */,
 				DABD3B5B1711E29800CF925C /* tip_basic_black_top_right@2x.png in Resources */,
 				DABD3B881711E29800CF925C /* book.png in Resources */,
@@ -3907,6 +3934,9 @@
 				93D398ECD7D1A0DEDDADF516 /* MPEmergencyViewController.m in Sources */,
 				93D391ED37C9F687FA51EAA1 /* MPEmergencySegue.m in Sources */,
 				93D394B5036C882B33C71872 /* MPPasswordsSegue.m in Sources */,
+				93D39673DDC085BE72C34D7C /* MPPopdownSegue.m in Sources */,
+				93D39B21156EC9A0B4C2BC83 /* MPPreferencesViewControllerOld.m in Sources */,
+				93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

MasterPassword/ObjC/iOS/Storyboard.storyboard

@@ -19,24 +19,29 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rWM-08-aab" userLabel="Users Root">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rWM-08-aab" userLabel="Users Root">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
+                                <rect key="frame" x="0.0" y="0.0" width="321" height="504"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="VDd-oM-ZOO" userLabel="Store Activity">
                                         <rect key="frame" x="142" y="234" width="37" height="37"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     </activityIndicatorView>
-                                    <navigationBar contentMode="scaleToFill" misplaced="YES" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="790-G2-I8g">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PRM-X2-n94">
-                                        <rect key="frame" x="0.0" y="20" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="-483" width="321" height="503"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
+                                    </view>
+                                    <navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="790-G2-I8g">
+                                        <rect key="frame" x="0.0" y="20" width="321" height="44"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <color key="barTintColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
                                         <items>
                                             <navigationItem id="WjE-Yw-JEC"/>
                                         </items>
                                     </navigationBar>
-                                    <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.0" contentMode="scaleToFill" misplaced="YES" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="L6J-pd-gcp" userLabel="Avatar Collection">
+                                    <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.0" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="L6J-pd-gcp" userLabel="Avatar Collection">
-                                        <rect key="frame" x="0.0" y="20" width="320" height="484"/>
+                                        <rect key="frame" x="0.0" y="20" width="321" height="484"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="ATB-kM-EGu">
@@ -131,23 +136,21 @@
                                         </connections>
                                     </collectionView>
                                     <button opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9u7-pu-Wtv" userLabel="Previous Avatar">
-                                        <rect key="frame" x="0.0" y="107" width="44" height="93"/>
+                                        <rect key="frame" x="0.0" y="127" width="44" height="53"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="44" id="Ay6-Jg-c3T"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" name="SourceCodePro-ExtraLight" family="Source Code Pro" pointSize="32"/>
-                                        <state key="normal">
+                                        <state key="normal" title="〈">
-                                            <string key="title">〈
-❬</string>
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
                                             <action selector="changeAvatar:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="lNu-mK-3zD"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUK-gJ-NRE" userLabel="Next Avatar">
+                                    <button opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUK-gJ-NRE" userLabel="Next Avatar">
-                                        <rect key="frame" x="276" y="127" width="44" height="53"/>
+                                        <rect key="frame" x="277" y="127" width="44" height="53"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="44" id="oAm-YX-Fx5"/>
@@ -160,24 +163,24 @@
                                             <action selector="changeAvatar:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="kL5-zV-zbb"/>
                                         </connections>
                                     </button>
-                                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qp1-nX-o4i" userLabel="Entry" customClass="PearlUIView">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qp1-nX-o4i" userLabel="Entry" customClass="PearlUIView">
-                                        <rect key="frame" x="20" y="216" width="280" height="63"/>
+                                        <rect key="frame" x="20" y="216" width="281" height="63"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <subviews>
-                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="Enter your full name:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="5fe-rt-zFa" userLabel="Entry Label">
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter your full name:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="5fe-rt-zFa" userLabel="Entry Label">
-                                                <rect key="frame" x="20" y="0.0" width="240" height="18"/>
+                                                <rect key="frame" x="20" y="0.0" width="241" height="18"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                 <fontDescription key="fontDescription" name="Copperplate" family="Copperplate" pointSize="17"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="ui_textfield.png" translatesAutoresizingMaskIntoConstraints="NO" id="UfK-na-vOU" userLabel="Field Background">
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="ui_textfield.png" translatesAutoresizingMaskIntoConstraints="NO" id="UfK-na-vOU" userLabel="Field Background">
-                                                <rect key="frame" x="0.0" y="26" width="280" height="37"/>
+                                                <rect key="frame" x="0.0" y="26" width="281" height="37"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                 <rect key="contentStretch" x="0.25" y="0.25" width="0.49999999999999961" height="0.49999999999999961"/>
                                             </imageView>
-                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" clearsOnBeginEditing="YES" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="z3Z-AB-fG2" userLabel="Entry Field">
+                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" clearsOnBeginEditing="YES" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="z3Z-AB-fG2" userLabel="Entry Field">
-                                                <rect key="frame" x="10" y="30" width="260" height="29"/>
+                                                <rect key="frame" x="10" y="30" width="261" height="29"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <fontDescription key="fontDescription" name="Copperplate" family="Copperplate" pointSize="28"/>
@@ -186,24 +189,24 @@
                                                     <outlet property="delegate" destination="S8q-YF-Kt9" id="5u3-XN-LOe"/>
                                                 </connections>
                                             </textField>
-                                            <view userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fdS-zb-K9I" userLabel="Entry Tip">
+                                            <view userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fdS-zb-K9I" userLabel="Entry Tip">
-                                                <rect key="frame" x="28" y="-38" width="224" height="82"/>
+                                                <rect key="frame" x="28" y="-38" width="225" height="82"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                 <subviews>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="tip_basic_black.png" translatesAutoresizingMaskIntoConstraints="NO" id="g2g-5i-er4">
+                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black.png" translatesAutoresizingMaskIntoConstraints="NO" id="g2g-5i-er4">
-                                                        <rect key="frame" x="0.0" y="0.0" width="224" height="82"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="225" height="82"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <rect key="contentStretch" x="0.15000000000000002" y="0.14999999999999999" width="0.69999999999999973" height="0.44999999999999996"/>
                                                     </imageView>
-                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="Looks like a typo!" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="ZI7-qg-7OW">
+                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Looks like a typo!" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="ZI7-qg-7OW">
-                                                        <rect key="frame" x="20" y="12" width="184" height="17"/>
+                                                        <rect key="frame" x="20" y="12" width="185" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="Try again; the password was wrong." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" preferredMaxLayoutWidth="185" translatesAutoresizingMaskIntoConstraints="NO" id="KhE-Yj-Kvm">
+                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Try again; the password was wrong." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" preferredMaxLayoutWidth="185" translatesAutoresizingMaskIntoConstraints="NO" id="KhE-Yj-Kvm">
-                                                        <rect key="frame" x="19" y="37" width="185" height="14"/>
+                                                        <rect key="frame" x="20" y="37" width="185" height="14"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
@@ -247,8 +250,8 @@
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreTouches" value="YES"/>
                                         </userDefinedRuntimeAttributes>
                                     </view>
-                                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XEP-O3-ayG" userLabel="Footer" customClass="PearlUIView">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XEP-O3-ayG" userLabel="Footer" customClass="PearlUIView">
-                                        <rect key="frame" x="0.0" y="403" width="320" height="101"/>
+                                        <rect key="frame" x="0.0" y="403" width="321" height="101"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vHz-dw-oPb" userLabel="GitTip" customClass="LLGitTip">
@@ -287,8 +290,8 @@
                                                     <constraint firstItem="Z8P-ZK-aS0" firstAttribute="top" secondItem="069-Pu-yXe" secondAttribute="top" id="wre-wd-rRo"/>
                                                 </constraints>
                                             </view>
-                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.5" contentMode="left" misplaced="YES" text="Press and hold to delete or reset user." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="N9g-Kk-yjc" userLabel="Hint">
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.5" contentMode="left" text="Press and hold to delete or reset user." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="N9g-Kk-yjc" userLabel="Hint">
-                                                <rect key="frame" x="20" y="79" width="280" height="14"/>
+                                                <rect key="frame" x="20" y="79" width="281" height="14"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <fontDescription key="fontDescription" name="Copperplate" family="Copperplate" pointSize="12"/>
                                                 <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
@@ -320,9 +323,12 @@
                                     <constraint firstItem="qp1-nX-o4i" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" constant="20" symbolic="YES" id="DY1-Ad-Mbi"/>
                                     <constraint firstItem="qp1-nX-o4i" firstAttribute="top" secondItem="fUK-gJ-NRE" secondAttribute="centerY" constant="62" id="KaV-34-aBy"/>
                                     <constraint firstAttribute="bottom" secondItem="XEP-O3-ayG" secondAttribute="bottom" id="PpW-Of-YOc"/>
+                                    <constraint firstAttribute="trailing" secondItem="PRM-X2-n94" secondAttribute="trailing" id="RIe-EH-8BQ"/>
                                     <constraint firstAttribute="trailing" secondItem="fUK-gJ-NRE" secondAttribute="trailing" id="TBr-pS-kEK"/>
                                     <constraint firstItem="790-G2-I8g" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="YWp-yC-ar7"/>
+                                    <constraint firstItem="PRM-X2-n94" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="Znv-SN-wGy"/>
                                     <constraint firstAttribute="trailing" secondItem="qp1-nX-o4i" secondAttribute="trailing" constant="20" symbolic="YES" id="cOq-BS-Xmo"/>
+                                    <constraint firstItem="790-G2-I8g" firstAttribute="top" secondItem="PRM-X2-n94" secondAttribute="bottom" id="cgy-Hq-GuL"/>
                                     <constraint firstAttribute="top" secondItem="790-G2-I8g" secondAttribute="bottom" priority="1" id="dTp-TY-5bb"/>
                                     <constraint firstAttribute="centerY" secondItem="VDd-oM-ZOO" secondAttribute="centerY" id="dxP-im-1dM"/>
                                     <constraint firstItem="qp1-nX-o4i" firstAttribute="top" secondItem="9u7-pu-Wtv" secondAttribute="centerY" constant="62" id="go1-rO-rVJ"/>
@@ -330,6 +336,7 @@
                                     <constraint firstItem="XEP-O3-ayG" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="pAt-0Y-LYv"/>
                                     <constraint firstAttribute="trailing" secondItem="XEP-O3-ayG" secondAttribute="trailing" id="raD-hD-OYt"/>
                                     <constraint firstItem="9u7-pu-Wtv" firstAttribute="leading" secondItem="rWM-08-aab" secondAttribute="leading" id="sez-BC-G3I"/>
+                                    <constraint firstItem="PRM-X2-n94" firstAttribute="height" secondItem="rWM-08-aab" secondAttribute="height" id="wBZ-wR-Qlj"/>
                                 </constraints>
                             </view>
                         </subviews>
@@ -381,6 +388,7 @@
         <scene sceneID="bzn-yi-kMJ">
             <objects>
                 <navigationController definesPresentationContext="YES" id="Q1S-vU-GGO" sceneMemberID="viewController">
+                    <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="4yl-zs-iUd">
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -437,6 +445,307 @@
             </objects>
             <point key="canvasLocation" x="813" y="464"/>
         </scene>
+        <!--Tab Bar Controller-->
+        <scene sceneID="NAI-IB-5AD">
+            <objects>
+                <tabBarController definesPresentationContext="YES" id="0Pk-uR-lak" sceneMemberID="viewController">
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <tabBar key="tabBar" contentMode="scaleToFill" barStyle="black" id="tqL-Kc-hm1">
+                        <rect key="frame" x="129" y="330" width="163" height="49"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    </tabBar>
+                    <connections>
+                        <segue destination="JFc-sj-awD" kind="relationship" relationship="viewControllers" id="bwn-ao-Y5g"/>
+                        <segue destination="IJT-xV-jHt" kind="relationship" relationship="viewControllers" id="MMX-ly-cXu"/>
+                        <segue destination="C0Q-RC-szS" kind="relationship" relationship="viewControllers" id="wap-5K-BMD"/>
+                    </connections>
+                </tabBarController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4Z1-Y7-eUn" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1887" y="1200"/>
+        </scene>
+        <!--Preferences View Controller - Preferences-->
+        <scene sceneID="w0h-au-0xw">
+            <objects>
+                <tableViewController automaticallyAdjustsScrollViewInsets="NO" id="JFc-sj-awD" customClass="MPPreferencesViewController" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="i7C-FZ-DNs" customClass="MPTableView">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
+                        <inset key="scrollIndicatorInsets" minX="0.0" minY="64" maxX="0.0" maxY="49"/>
+                        <color key="separatorColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
+                        <sections>
+                            <tableViewSection id="FEv-Rb-jst">
+                                <cells>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="85" id="9QG-lM-ymM">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="85"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9QG-lM-ymM" id="hK8-XQ-lLz">
+                                            <rect key="frame" x="0.0" y="0.0" width="287" height="84"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5zr-Nr-zRb">
+                                                    <rect key="frame" x="20" y="20" width="280" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" misplaced="YES" text="Contact us if you have a question, idea, praise or issue." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="8dg-Ew-Vy1">
+                                                    <rect key="frame" x="20" y="49" width="280" height="10"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="11"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="5zr-Nr-zRb" secondAttribute="trailing" constant="20" symbolic="YES" id="1pJ-4R-e70"/>
+                                                <constraint firstItem="5zr-Nr-zRb" firstAttribute="top" secondItem="hK8-XQ-lLz" secondAttribute="top" constant="20" symbolic="YES" id="Qyy-op-8rF"/>
+                                                <constraint firstAttribute="bottom" secondItem="8dg-Ew-Vy1" secondAttribute="bottom" constant="20" symbolic="YES" id="Vvm-LR-T4D"/>
+                                                <constraint firstItem="8dg-Ew-Vy1" firstAttribute="leading" secondItem="hK8-XQ-lLz" secondAttribute="leading" constant="20" symbolic="YES" id="bKG-A1-FFR"/>
+                                                <constraint firstItem="5zr-Nr-zRb" firstAttribute="leading" secondItem="hK8-XQ-lLz" secondAttribute="leading" constant="20" symbolic="YES" id="cza-7Y-Ya8"/>
+                                                <constraint firstItem="8dg-Ew-Vy1" firstAttribute="top" secondItem="5zr-Nr-zRb" secondAttribute="bottom" constant="8" symbolic="YES" id="gfg-dO-fIg"/>
+                                                <constraint firstAttribute="trailing" secondItem="8dg-Ew-Vy1" secondAttribute="trailing" constant="20" symbolic="YES" id="pGu-6f-DPi"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="130" id="B8R-iE-Ffe">
+                                        <rect key="frame" x="0.0" y="85" width="320" height="130"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="B8R-iE-Ffe" id="8r5-Zc-TRj">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="129"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Default Password Type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dws-U7-RI8">
+                                                    <rect key="frame" x="20" y="20" width="280" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="The password type to use to when creating a new site." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="mzg-1u-aEg">
+                                                    <rect key="frame" x="20" y="49" width="280" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="11"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <segmentedControl opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="Rei-aO-UBD" userLabel="Type">
+                                                    <rect key="frame" x="14" y="81" width="293" height="29"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <segments>
+                                                        <segment title="Max"/>
+                                                        <segment title="Long"/>
+                                                        <segment title="Med"/>
+                                                        <segment title="Basic"/>
+                                                        <segment title="Short"/>
+                                                        <segment title="PIN"/>
+                                                    </segments>
+                                                    <color key="tintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <connections>
+                                                        <action selector="controlChanged:" destination="osn-5H-SWW" eventType="valueChanged" id="P0e-EN-yGL"/>
+                                                        <action selector="valueChanged:" destination="JFc-sj-awD" eventType="valueChanged" id="rK0-OG-BCo"/>
+                                                    </connections>
+                                                </segmentedControl>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="centerX" secondItem="Rei-aO-UBD" secondAttribute="centerX" id="4no-xw-94n"/>
+                                                <constraint firstItem="Rei-aO-UBD" firstAttribute="top" secondItem="mzg-1u-aEg" secondAttribute="bottom" constant="8" symbolic="YES" id="FgV-rk-znJ"/>
+                                                <constraint firstAttribute="trailing" secondItem="dws-U7-RI8" secondAttribute="trailing" constant="20" symbolic="YES" id="MPT-ad-KIg"/>
+                                                <constraint firstItem="mzg-1u-aEg" firstAttribute="leading" secondItem="8r5-Zc-TRj" secondAttribute="leading" constant="20" symbolic="YES" id="R41-FU-rgR"/>
+                                                <constraint firstAttribute="trailing" secondItem="mzg-1u-aEg" secondAttribute="trailing" constant="20" symbolic="YES" id="Zaz-ac-zVb"/>
+                                                <constraint firstItem="mzg-1u-aEg" firstAttribute="top" secondItem="dws-U7-RI8" secondAttribute="bottom" constant="8" symbolic="YES" id="fha-BH-BSe"/>
+                                                <constraint firstItem="dws-U7-RI8" firstAttribute="leading" secondItem="8r5-Zc-TRj" secondAttribute="leading" constant="20" symbolic="YES" id="mAw-17-5NL"/>
+                                                <constraint firstAttribute="bottom" secondItem="Rei-aO-UBD" secondAttribute="bottom" constant="20" symbolic="YES" id="oWb-ua-67J"/>
+                                                <constraint firstItem="dws-U7-RI8" firstAttribute="top" secondItem="8r5-Zc-TRj" secondAttribute="top" constant="20" symbolic="YES" id="ocS-9x-Qde"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="220" id="Sz1-JP-dw2">
+                                        <rect key="frame" x="0.0" y="215" width="320" height="220"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sz1-JP-dw2" id="R4X-LE-ir9">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="219"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Avatar" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="njo-UA-mT3">
+                                                    <rect key="frame" x="20" y="20" width="280" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="The icon that represents your user on the login screen.  It has no bearing on your passwords." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="AA4-AD-IbY">
+                                                    <rect key="frame" x="20" y="49" width="280" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="11"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar-0.png" translatesAutoresizingMaskIntoConstraints="NO" id="tWi-sc-DGp" userLabel="Avatar">
+                                                    <rect key="frame" x="105" y="89" width="110" height="110"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <color key="tintColor" red="0.47450980390000003" green="0.86666666670000003" blue="0.98431372549999996" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" secondItem="tWi-sc-DGp" secondAttribute="height" multiplier="1:1" id="SIr-0t-9xA"/>
+                                                        <constraint firstAttribute="height" constant="110" id="zBf-EA-iDN"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <button opaque="NO" alpha="0.69999998807907104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DzC-Ts-gew" userLabel="Previous Avatar">
+                                                    <rect key="frame" x="20" y="117" width="44" height="53"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="1Wu-gS-flK"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" name="SourceCodePro-ExtraLight" family="Source Code Pro" pointSize="32"/>
+                                                    <state key="normal" title="〈">
+                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
+                                                    <connections>
+                                                        <action selector="changeAvatar:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="dkH-N8-N76"/>
+                                                        <action selector="previousAvatar:" destination="JFc-sj-awD" eventType="touchUpInside" id="D92-6I-zFd"/>
+                                                    </connections>
+                                                </button>
+                                                <button opaque="NO" alpha="0.69999998807907104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yAf-fc-SKl" userLabel="Next Avatar">
+                                                    <rect key="frame" x="256" y="117" width="44" height="53"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="pEf-Vp-D7s"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" name="SourceCodePro-ExtraLight" family="Source Code Pro" pointSize="32"/>
+                                                    <state key="normal" title="〉">
+                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
+                                                    <connections>
+                                                        <action selector="changeAvatar:" destination="S8q-YF-Kt9" eventType="touchUpInside" id="Dus-we-gpT"/>
+                                                        <action selector="nextAvatar:" destination="JFc-sj-awD" eventType="touchUpInside" id="wIz-Lc-Pw4"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="centerX" secondItem="tWi-sc-DGp" secondAttribute="centerX" id="0eQ-Nb-hFI"/>
+                                                <constraint firstAttribute="bottom" secondItem="tWi-sc-DGp" secondAttribute="bottom" constant="20" symbolic="YES" id="4I0-RM-qi7"/>
+                                                <constraint firstAttribute="trailing" secondItem="yAf-fc-SKl" secondAttribute="trailing" constant="20" symbolic="YES" id="9ao-Sw-Ngn"/>
+                                                <constraint firstItem="tWi-sc-DGp" firstAttribute="top" secondItem="AA4-AD-IbY" secondAttribute="bottom" constant="8" symbolic="YES" id="S7X-yX-aqd"/>
+                                                <constraint firstItem="AA4-AD-IbY" firstAttribute="leading" secondItem="R4X-LE-ir9" secondAttribute="leading" constant="20" symbolic="YES" id="WON-6o-plH"/>
+                                                <constraint firstAttribute="trailing" secondItem="AA4-AD-IbY" secondAttribute="trailing" constant="20" symbolic="YES" id="ZGP-kD-AeB"/>
+                                                <constraint firstItem="DzC-Ts-gew" firstAttribute="leading" secondItem="R4X-LE-ir9" secondAttribute="leading" constant="20" symbolic="YES" id="cpf-i2-Qrg"/>
+                                                <constraint firstAttribute="trailing" secondItem="njo-UA-mT3" secondAttribute="trailing" constant="20" symbolic="YES" id="d2x-81-wZd"/>
+                                                <constraint firstItem="tWi-sc-DGp" firstAttribute="width" secondItem="tWi-sc-DGp" secondAttribute="height" multiplier="1:1" id="da3-K0-fFd"/>
+                                                <constraint firstItem="AA4-AD-IbY" firstAttribute="top" secondItem="njo-UA-mT3" secondAttribute="bottom" constant="8" symbolic="YES" id="gCF-WG-zfL"/>
+                                                <constraint firstItem="njo-UA-mT3" firstAttribute="leading" secondItem="R4X-LE-ir9" secondAttribute="leading" constant="20" symbolic="YES" id="lf5-uF-NSb"/>
+                                                <constraint firstItem="tWi-sc-DGp" firstAttribute="centerY" secondItem="yAf-fc-SKl" secondAttribute="centerY" id="lft-s3-f0O"/>
+                                                <constraint firstItem="tWi-sc-DGp" firstAttribute="centerY" secondItem="DzC-Ts-gew" secondAttribute="centerY" id="pPJ-1f-8WO"/>
+                                                <constraint firstItem="njo-UA-mT3" firstAttribute="top" secondItem="R4X-LE-ir9" secondAttribute="top" constant="20" symbolic="YES" id="ski-78-tB4"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="230" id="fRZ-Uh-FR8">
+                                        <rect key="frame" x="0.0" y="435" width="320" height="230"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fRZ-Uh-FR8" id="qCQ-L5-teL">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="229"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jr5-mX-nw0">
+                                                    <rect key="frame" x="136" y="178" width="51" height="31"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <connections>
+                                                        <action selector="didToggleSwitch:" destination="JFc-sj-awD" eventType="valueChanged" id="byF-3g-DmH"/>
+                                                    </connections>
+                                                </switch>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Save Password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3fk-Io-xQI">
+                                                    <rect key="frame" x="20" y="20" width="280" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="Z1N-JR-4fr">
+                                                    <rect key="frame" x="20" y="49" width="280" height="121"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <string key="text">"Save Password" will store your master password in the keychain.  This means you won't need the master password anymore to log in (unless your device gets restored or you start using a new device). This is somewhat less secure in the event of theft.  You can compensate for the reduced security by going into Settings and navigating: General-&gt;Passcode Lock, disabling "Simple Passcode", and setting a more secure passcode for your device.</string>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="11"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="Z1N-JR-4fr" firstAttribute="top" secondItem="3fk-Io-xQI" secondAttribute="bottom" constant="8" symbolic="YES" id="40p-FJ-UtF"/>
+                                                <constraint firstItem="3fk-Io-xQI" firstAttribute="leading" secondItem="qCQ-L5-teL" secondAttribute="leading" constant="20" symbolic="YES" id="503-SE-Mgl"/>
+                                                <constraint firstAttribute="trailing" secondItem="3fk-Io-xQI" secondAttribute="trailing" constant="20" symbolic="YES" id="8ft-Z7-xpO"/>
+                                                <constraint firstAttribute="trailing" secondItem="Z1N-JR-4fr" secondAttribute="trailing" constant="20" symbolic="YES" id="Av8-lV-CPs"/>
+                                                <constraint firstItem="Z1N-JR-4fr" firstAttribute="leading" secondItem="qCQ-L5-teL" secondAttribute="leading" constant="20" symbolic="YES" id="Fmu-pr-2uO"/>
+                                                <constraint firstItem="3fk-Io-xQI" firstAttribute="top" secondItem="qCQ-L5-teL" secondAttribute="top" constant="20" symbolic="YES" id="OLs-pB-2g6"/>
+                                                <constraint firstAttribute="bottom" secondItem="Jr5-mX-nw0" secondAttribute="bottom" constant="20" id="ZHR-kl-0F0"/>
+                                                <constraint firstAttribute="centerX" secondItem="Jr5-mX-nw0" secondAttribute="centerX" id="d7p-VD-OOM"/>
+                                                <constraint firstItem="Jr5-mX-nw0" firstAttribute="top" secondItem="Z1N-JR-4fr" secondAttribute="bottom" constant="8" symbolic="YES" id="pLg-Hf-Cfg"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="125" id="IVT-Rs-nTu">
+                                        <rect key="frame" x="0.0" y="665" width="320" height="125"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IVT-Rs-nTu" id="Q5J-2f-mmz">
+                                            <rect key="frame" x="0.0" y="0.0" width="287" height="124"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Export" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KEh-y5-Obc">
+                                                    <rect key="frame" x="20" y="20" width="280" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" misplaced="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="U77-XF-Bvb">
+                                                    <rect key="frame" x="20" y="49" width="280" height="55"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <string key="text">An export saves all your sites and optionally their passwords to a file that you can store separately.  It can function as a back-up or a way to move all your sites to a new device.</string>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="11"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="U77-XF-Bvb" secondAttribute="trailing" constant="20" symbolic="YES" id="Oc8-qI-cbW"/>
+                                                <constraint firstItem="U77-XF-Bvb" firstAttribute="top" secondItem="KEh-y5-Obc" secondAttribute="bottom" constant="8" symbolic="YES" id="TWk-yN-sev"/>
+                                                <constraint firstItem="U77-XF-Bvb" firstAttribute="leading" secondItem="Q5J-2f-mmz" secondAttribute="leading" constant="20" symbolic="YES" id="aLD-dt-cee"/>
+                                                <constraint firstItem="KEh-y5-Obc" firstAttribute="leading" secondItem="Q5J-2f-mmz" secondAttribute="leading" constant="20" symbolic="YES" id="mxB-IT-OP6"/>
+                                                <constraint firstAttribute="trailing" secondItem="KEh-y5-Obc" secondAttribute="trailing" constant="20" symbolic="YES" id="njQ-30-8oI"/>
+                                                <constraint firstAttribute="bottom" secondItem="U77-XF-Bvb" secondAttribute="bottom" constant="20" symbolic="YES" id="yXQ-zQ-vet"/>
+                                                <constraint firstItem="KEh-y5-Obc" firstAttribute="top" secondItem="Q5J-2f-mmz" secondAttribute="top" constant="20" symbolic="YES" id="zuy-l8-JWN"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="JFc-sj-awD" id="REs-mU-jSw"/>
+                            <outlet property="delegate" destination="JFc-sj-awD" id="vnb-Jg-OwC"/>
+                        </connections>
+                    </tableView>
+                    <tabBarItem key="tabBarItem" title="Preferences" image="icon_person.png" id="wmG-G2-TA9"/>
+                    <nil key="simulatedStatusBarMetrics"/>
+                    <size key="freeformSize" width="320" height="568"/>
+                    <connections>
+                        <outlet property="avatarImage" destination="tWi-sc-DGp" id="ifT-Ct-WL6"/>
+                        <outlet property="exportCell" destination="IVT-Rs-nTu" id="RU0-qr-Bdi"/>
+                        <outlet property="feedbackCell" destination="9QG-lM-ymM" id="18X-Ph-0ac"/>
+                        <outlet property="savePasswordSwitch" destination="Jr5-mX-nw0" id="eqq-Xo-9Iq"/>
+                        <outlet property="typeControl" destination="Rei-aO-UBD" id="FzA-4c-RtW"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="fk3-aq-W8p" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2424" y="1200"/>
+        </scene>
         <!--Passwords View Controller-->
         <scene sceneID="I40-Es-1gK">
             <objects>
@@ -453,22 +762,20 @@
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uuT-jm-2La" userLabel="Navigation" customClass="PearlUINavigationBar">
+                                    <navigationBar opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" barStyle="black" backIndicatorImage="empty.png" translatesAutoresizingMaskIntoConstraints="NO" id="uuT-jm-2La" userLabel="Navigation" customClass="PearlUINavigationBar">
                                         <rect key="frame" x="0.0" y="20" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                        <color key="barTintColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
                                         <items>
                                             <navigationItem id="JCx-F3-LfN">
                                                 <barButtonItem key="rightBarButtonItem" systemItem="action" id="NHA-Vf-agZ">
                                                     <connections>
-                                                        <action selector="action:" destination="nkY-z6-8jd" id="bgD-pW-lMz"/>
+                                                        <segue destination="0Pk-uR-lak" kind="custom" identifier="popdown" customClass="MPPopdownSegue" id="2Uk-iv-ErE"/>
                                                     </connections>
                                                 </barButtonItem>
                                             </navigationItem>
                                         </items>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreTouches" value="YES"/>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="invisible" value="YES"/>
                                         </userDefinedRuntimeAttributes>
                                     </navigationBar>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K2e-Gh-7hH" userLabel="Passwords Container">
@@ -880,17 +1187,67 @@
                                             <constraint firstAttribute="trailing" secondItem="oAG-Ea-TOI" secondAttribute="trailing" id="wDZ-R2-3ul"/>
                                         </constraints>
                                     </view>
+                                    <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XNM-XQ-rMe" userLabel="Popdown">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <subviews>
+                                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="87Y-Vu-Q7D">
+                                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <items/>
+                                            </toolbar>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bnY-br-a2v" userLabel="Popdown Container">
+                                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                            </view>
+                                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" verticalHuggingPriority="251" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="VOY-zU-XQR">
+                                                <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                <items>
+                                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="gnP-97-6Mt"/>
+                                                    <barButtonItem style="done" systemItem="done" id="0Nf-j3-Fye">
+                                                        <inset key="imageInsets" minX="0.0" minY="20" maxX="0.0" maxY="0.0"/>
+                                                        <connections>
+                                                            <action selector="dismissPopdown:" destination="nkY-z6-8jd" id="5A9-j1-fqG"/>
+                                                        </connections>
+                                                    </barButtonItem>
+                                                </items>
+                                            </toolbar>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        <gestureRecognizers/>
+                                        <constraints>
+                                            <constraint firstAttribute="bottom" secondItem="87Y-Vu-Q7D" secondAttribute="bottom" id="0kc-At-deM"/>
+                                            <constraint firstItem="VOY-zU-XQR" firstAttribute="leading" secondItem="XNM-XQ-rMe" secondAttribute="leading" id="43R-eN-iKb"/>
+                                            <constraint firstAttribute="trailing" secondItem="VOY-zU-XQR" secondAttribute="trailing" id="6A6-6h-xPa"/>
+                                            <constraint firstItem="bnY-br-a2v" firstAttribute="leading" secondItem="XNM-XQ-rMe" secondAttribute="leading" id="ERX-bD-a1g"/>
+                                            <constraint firstItem="87Y-Vu-Q7D" firstAttribute="leading" secondItem="XNM-XQ-rMe" secondAttribute="leading" id="Kvy-MT-upZ"/>
+                                            <constraint firstAttribute="trailing" secondItem="bnY-br-a2v" secondAttribute="trailing" id="M0m-1Y-7Jy"/>
+                                            <constraint firstAttribute="bottom" secondItem="bnY-br-a2v" secondAttribute="bottom" id="aoA-vk-MYZ"/>
+                                            <constraint firstAttribute="trailing" secondItem="87Y-Vu-Q7D" secondAttribute="trailing" id="cwH-Vs-lO7"/>
+                                            <constraint firstItem="87Y-Vu-Q7D" firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="top" id="iYd-AY-vk8"/>
+                                            <constraint firstItem="VOY-zU-XQR" firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="top" id="qhF-GK-wSa"/>
+                                            <constraint firstItem="bnY-br-a2v" firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="top" id="uRJ-gN-ae4"/>
+                                        </constraints>
+                                    </view>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="trailing" secondItem="uuT-jm-2La" secondAttribute="trailing" id="2Ep-4f-05N"/>
                                     <constraint firstAttribute="top" secondItem="uuT-jm-2La" secondAttribute="bottom" priority="1" id="AkN-iE-w6G"/>
+                                    <constraint firstAttribute="top" secondItem="XNM-XQ-rMe" secondAttribute="bottom" priority="250" id="BdD-Kc-eHl"/>
                                     <constraint firstItem="uuT-jm-2La" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="DJd-kO-WGu"/>
                                     <constraint firstAttribute="trailing" secondItem="K2e-Gh-7hH" secondAttribute="trailing" id="Hnk-mU-GSd"/>
                                     <constraint firstAttribute="bottom" secondItem="K2e-Gh-7hH" secondAttribute="bottom" priority="1" id="NGV-JV-I6h"/>
+                                    <constraint firstItem="XNM-XQ-rMe" firstAttribute="height" secondItem="tI8-OT-LrO" secondAttribute="height" id="OCp-tF-gVL"/>
                                     <constraint firstItem="K2e-Gh-7hH" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="OcX-2p-rfX"/>
+                                    <constraint firstItem="XNM-XQ-rMe" firstAttribute="leading" secondItem="tI8-OT-LrO" secondAttribute="leading" id="PDG-pf-cBl"/>
+                                    <constraint firstAttribute="bottom" secondItem="XNM-XQ-rMe" secondAttribute="bottom" priority="500" id="ROj-WG-oic"/>
+                                    <constraint firstAttribute="trailing" secondItem="XNM-XQ-rMe" secondAttribute="trailing" id="bgl-u9-shU"/>
                                     <constraint firstItem="K2e-Gh-7hH" firstAttribute="top" secondItem="tI8-OT-LrO" secondAttribute="bottom" priority="1" id="dNt-uf-8BC"/>
                                     <constraint firstItem="K2e-Gh-7hH" firstAttribute="top" secondItem="uuT-jm-2La" secondAttribute="bottom" priority="750" id="f5D-iu-Jv4"/>
+                                    <constraint firstItem="uuT-jm-2La" firstAttribute="bottom" secondItem="VOY-zU-XQR" secondAttribute="bottom" id="zRg-DQ-eoM"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreTouches" value="YES"/>
@@ -903,13 +1260,12 @@
                             <constraint firstAttribute="top" secondItem="tI8-OT-LrO" secondAttribute="top" id="Vub-z3-GJi"/>
                             <constraint firstItem="c12-XI-Rv9" firstAttribute="top" secondItem="tI8-OT-LrO" secondAttribute="bottom" id="auY-cK-Gh9"/>
                             <constraint firstAttribute="trailing" secondItem="tI8-OT-LrO" secondAttribute="trailing" id="cHT-PO-Feh"/>
-                            <constraint firstItem="uuT-jm-2La" firstAttribute="top" secondItem="S9X-2T-e1e" secondAttribute="bottom" priority="500" id="cX0-4v-mqL"/>
+                            <constraint firstItem="uuT-jm-2La" firstAttribute="top" secondItem="S9X-2T-e1e" secondAttribute="bottom" priority="500" id="veX-pt-6RG"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreTouches" value="YES"/>
                         </userDefinedRuntimeAttributes>
                     </view>
-                    <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
                     <connections>
                         <outlet property="navigationBar" destination="uuT-jm-2La" id="lRz-Ok-jvw"/>
                         <outlet property="navigationBarToPasswordsConstraint" destination="f5D-iu-Jv4" id="2r1-9t-swq"/>
@@ -918,6 +1274,9 @@
                         <outlet property="passwordSelectionContainer" destination="tI8-OT-LrO" id="J91-sd-kq3"/>
                         <outlet property="passwordsSearchBar" destination="oAG-Ea-TOI" id="sqL-H5-LCV"/>
                         <outlet property="passwordsToBottomConstraint" destination="dNt-uf-8BC" id="Ta6-eL-z7w"/>
+                        <outlet property="popdownContainer" destination="bnY-br-a2v" id="7QN-qY-iCl"/>
+                        <outlet property="popdownToTopConstraint" destination="BdD-Kc-eHl" id="59Y-ap-Yn4"/>
+                        <outlet property="popdownView" destination="XNM-XQ-rMe" id="FaW-4m-Fff"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="APh-u5-vFI" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1212,11 +1571,186 @@
             </objects>
             <point key="canvasLocation" x="1350" y="-264"/>
         </scene>
+        <!--App Settings View Controller - Settings-->
+        <scene sceneID="fmc-CS-nuo">
+            <objects>
+                <tableViewController automaticallyAdjustsScrollViewInsets="NO" id="IJT-xV-jHt" customClass="MPAppSettingsViewController" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="jPx-Oa-WxU">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <inset key="scrollIndicatorInsets" minX="0.0" minY="64" maxX="0.0" maxY="49"/>
+                        <color key="separatorColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="sectionIndexColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="-" id="3ZC-Sm-lB8">
+                                <rect key="frame" x="0.0" y="55" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ZC-Sm-lB8" id="UzB-cq-EM3">
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="IJT-xV-jHt" id="bMa-HU-UPY"/>
+                            <outlet property="delegate" destination="IJT-xV-jHt" id="MJE-yH-6xk"/>
+                        </connections>
+                    </tableView>
+                    <tabBarItem key="tabBarItem" title="Settings" image="icon_gears.png" id="K62-lO-hO3"/>
+                    <navigationItem key="navigationItem" title="Settings" id="FPc-yy-RoS">
+                        <barButtonItem key="rightBarButtonItem" title="Logs" id="rO8-gt-aLH"/>
+                    </navigationItem>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="sDE-fE-FNc" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2424" y="464"/>
+        </scene>
+        <!--View Controller-->
+        <scene sceneID="9SY-7D-CE9">
+            <objects>
+                <viewController id="z9O-w0-6oR" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="EnC-Uo-cUP"/>
+                        <viewControllerLayoutGuide type="bottom" id="fDn-y8-bUP"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="9l8-e1-3BO">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="fiE-U7-p6y" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2854" y="1936"/>
+        </scene>
+        <!--View Controller-->
+        <scene sceneID="qiQ-By-IQy">
+            <objects>
+                <viewController id="s6d-Gt-PIb" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="bJ2-LA-9Ep"/>
+                        <viewControllerLayoutGuide type="bottom" id="TpX-Zb-Pw8"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="fmT-a0-Dyg">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="OKk-Ht-Uzq" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2854" y="1200"/>
+        </scene>
+        <!--Logs View Controller - Logbook-->
+        <scene sceneID="cks-mO-kuy">
+            <objects>
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="C0Q-RC-szS" customClass="MPLogsViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="srl-H6-AgT"/>
+                        <viewControllerLayoutGuide type="bottom" id="DTJ-48-uZL"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="VRk-ZF-UQ6" userLabel="Root">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZLZ-Ds-7pp">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <inset key="scrollIndicatorInsets" minX="0.0" minY="64" maxX="0.0" maxY="93"/>
+                                <string key="text">119-20:51:52        MPiOSAppDelegate.m:36  | INFO    : Initializing TestFlight
+119-20:51:52        MPiOSAppDelegate.m:70  | INFO    : Initializing Google+
+119-20:51:52        MPiOSAppDelegate.m:80  | INFO    : Initializing Crashlytics
+119-20:51:52        MPiOSAppDelegate.m:109 | INFO    : Initializing Localytics
+119-20:51:53        PearlAppDelegate.m:71  | INFO    : Master Password (MasterPassword) 1.4 (1.4.0) (GIT: 1.4-0-g8a4eecd-dirty)
+119-20:51:53        MPiOSAppDelegate.m:257 | INFO    : Started up with device identifier: A8C51CDA-6F60-4F0C-BFC9-68A08F2F2DD7
+119-20:51:59     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] (Re)loading store...
+119-20:51:59     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Will load cloud store: 0B3CA2DF-5796-44DF-B5E0-121EC3846464 (definite).
+119-20:51:59             PearlConfig.m:193 | INFO    : Lock screen will appear
+119-20:51:59        MPiOSAppDelegate.m:412 | INFO    : Re-activated
+119-20:51:59             PearlConfig.m:180 | DEBUG   : MPiOSConfig.launchCount = [70 -&gt;] 71
+119-20:52:02     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Clearing stores...
+119-20:52:03     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Loading store without seeding.
+119-20:52:09     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Cloud enabled and successfully loaded cloud store.
+119-20:52:09     MPAppDelegate_Store.m:299 | INFO    : Using iCloud? 1
+119-20:52:12       MPAppDelegate_Key.m:28  | INFO    : Found key in keychain for: b55911588b178466be1d6392597e899b8de46f9a
+119-20:52:12       MPAppDelegate_Key.m:132 | INFO    : Logged in: b55911588b178466be1d6392597e899b8de46f9a
+119-20:52:13  MPUnlockViewController.m:229 | INFO    : Lock screen will disappear
+119-20:52:13    MPMainViewController.m:142 | INFO    : Main will appear
+119-20:52:16    MPMainViewController.m:734 | INFO    : Action: Preferences
+119-20:52:17    MPMainViewController.m:187 | INFO    : Main will disappear.
+</string>
+                                <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
+                                <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="9"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                            <toolbar contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="WmH-JB-jp2">
+                                <rect key="frame" x="0.0" y="475" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                <items>
+                                    <barButtonItem systemItem="action" id="JjQ-rY-m2q">
+                                        <connections>
+                                            <action selector="action:" destination="C0Q-RC-szS" id="Vi3-CE-YmV"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem systemItem="compose" id="BSV-3i-01h">
+                                        <connections>
+                                            <action selector="mail:" destination="C0Q-RC-szS" id="i37-jS-UfO"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem systemItem="refresh" id="x0S-kl-JB6">
+                                        <connections>
+                                            <action selector="refresh:" destination="C0Q-RC-szS" id="JFf-us-uLX"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem systemItem="flexibleSpace" id="Lp4-ss-KxI"/>
+                                    <barButtonItem style="plain" id="aMS-HH-mnE">
+                                        <segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="lxp-wx-uCy">
+                                            <rect key="frame" x="181" y="7" width="123" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <segments>
+                                                <segment title="Normal"/>
+                                                <segment title="Debug"/>
+                                            </segments>
+                                            <color key="tintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
+                                            <connections>
+                                                <action selector="toggleLevelControl:" destination="C0Q-RC-szS" eventType="valueChanged" id="Cr2-ls-YsB"/>
+                                            </connections>
+                                        </segmentedControl>
+                                        <color key="tintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
+                                    </barButtonItem>
+                                </items>
+                            </toolbar>
+                        </subviews>
+                        <color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="WmH-JB-jp2" secondAttribute="bottom" constant="49" id="3MJ-7p-Ko1"/>
+                            <constraint firstItem="ZLZ-Ds-7pp" firstAttribute="top" secondItem="VRk-ZF-UQ6" secondAttribute="top" id="SDj-uX-oNC"/>
+                            <constraint firstAttribute="bottom" secondItem="ZLZ-Ds-7pp" secondAttribute="bottom" id="bpm-15-Rgy"/>
+                            <constraint firstAttribute="trailing" secondItem="WmH-JB-jp2" secondAttribute="trailing" id="f4Q-oI-Dxc"/>
+                            <constraint firstAttribute="trailing" secondItem="ZLZ-Ds-7pp" secondAttribute="trailing" id="iID-PM-DSF"/>
+                            <constraint firstItem="ZLZ-Ds-7pp" firstAttribute="leading" secondItem="VRk-ZF-UQ6" secondAttribute="leading" id="tgm-Jm-JHb"/>
+                            <constraint firstItem="WmH-JB-jp2" firstAttribute="leading" secondItem="VRk-ZF-UQ6" secondAttribute="leading" id="xSf-im-aKP"/>
+                        </constraints>
+                    </view>
+                    <tabBarItem key="tabBarItem" title="Logbook" image="icon_book.png" id="Klq-Va-cPA"/>
+                    <connections>
+                        <outlet property="levelControl" destination="lxp-wx-uCy" id="Raw-fh-irR"/>
+                        <outlet property="logView" destination="ZLZ-Ds-7pp" id="pfU-cH-l2L"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="SoG-sw-ghb" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2424" y="1936"/>
+        </scene>
     </scenes>
     <resources>
         <image name="avatar-0.png" width="110" height="110"/>
         <image name="background.png" width="568" height="568"/>
+        <image name="empty.png" width="1" height="1"/>
         <image name="gittip.png" width="89" height="18"/>
+        <image name="icon_book.png" width="32" height="32"/>
         <image name="icon_cancel.png" width="32" height="32"/>
         <image name="icon_edit.png" width="32" height="32"/>
         <image name="icon_gears.png" width="32" height="32"/>