diff --git a/MasterPassword.xcodeproj/project.pbxproj b/MasterPassword.xcodeproj/project.pbxproj
index ca18fdb6..9f48446f 100644
--- a/MasterPassword.xcodeproj/project.pbxproj
+++ b/MasterPassword.xcodeproj/project.pbxproj
@@ -204,6 +204,7 @@
 		DA84819514CB521E00A2FA22 /* tip_location_teal.png in Resources */ = {isa = PBXBuildFile; fileRef = DA84817714CB521E00A2FA22 /* tip_location_teal.png */; };
 		DA84819614CB521E00A2FA22 /* tip_location_wood.png in Resources */ = {isa = PBXBuildFile; fileRef = DA84817814CB521E00A2FA22 /* tip_location_wood.png */; };
 		DA8E8E4614DD7C1D0044257E /* logo-bare.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8E8E4514DD7C1D0044257E /* logo-bare.png */; };
+		DA8E8E5114DE78C20044257E /* OPMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA8E8E5014DE78C20044257E /* OPMenuViewController.m */; };
 		DAA3B68E14CCCEE700F35AF6 /* icon_addressbook-person@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA3B53814CCCEE700F35AF6 /* icon_addressbook-person@2x.png */; };
 		DAA3B68F14CCCEE700F35AF6 /* icon_addressbook.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA3B53914CCCEE700F35AF6 /* icon_addressbook.png */; };
 		DAA3B69014CCCEE700F35AF6 /* icon_addressbook@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA3B53A14CCCEE700F35AF6 /* icon_addressbook@2x.png */; };
@@ -907,6 +908,8 @@
 		DA84817814CB521E00A2FA22 /* tip_location_wood.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tip_location_wood.png; sourceTree = "<group>"; };
 		DA8E8E4514DD7C1D0044257E /* logo-bare.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "logo-bare.png"; path = "Resources/logo-bare.png"; sourceTree = "<group>"; };
 		DA8E8E4714DDA62D0044257E /* MasterPassword.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = MasterPassword.entitlements; sourceTree = "<group>"; };
+		DA8E8E4F14DE78C20044257E /* OPMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPMenuViewController.h; sourceTree = "<group>"; };
+		DA8E8E5014DE78C20044257E /* OPMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPMenuViewController.m; sourceTree = "<group>"; };
 		DAA3B53814CCCEE700F35AF6 /* icon_addressbook-person@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_addressbook-person@2x.png"; sourceTree = "<group>"; };
 		DAA3B53914CCCEE700F35AF6 /* icon_addressbook.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_addressbook.png; sourceTree = "<group>"; };
 		DAA3B53A14CCCEE700F35AF6 /* icon_addressbook@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_addressbook@2x.png"; sourceTree = "<group>"; };
@@ -1825,6 +1828,8 @@
 				DAE2C646148247E500BA6B10 /* OPTypeViewController.m */,
 				DA55B29C14B38272001131B7 /* OPContentViewController.h */,
 				DA55B29D14B38272001131B7 /* OPContentViewController.m */,
+				DA8E8E4F14DE78C20044257E /* OPMenuViewController.h */,
+				DA8E8E5014DE78C20044257E /* OPMenuViewController.m */,
 				DA34DA1414B1BEA100F721C1 /* OPTypes.h */,
 				DA34DA1514B1BEA100F721C1 /* OPTypes.m */,
 				DA007F5014B24DCC00251337 /* OPConfig.h */,
@@ -3040,6 +3045,7 @@
 				DA0A848C14C4DFCB0090EA8E /* OPElementGeneratedEntity.m in Sources */,
 				DAA3B81414CDC77100F35AF6 /* jquery-1.6.1.min.js in Sources */,
 				DA65570614D731F000841C99 /* OPGuideViewController.m in Sources */,
+				DA8E8E5114DE78C20044257E /* OPMenuViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MasterPassword/MainStoryboard_iPhone.storyboard b/MasterPassword/MainStoryboard_iPhone.storyboard
index d38e0936..f372393d 100644
--- a/MasterPassword/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/MainStoryboard_iPhone.storyboard
@@ -241,7 +241,7 @@ The passwords aren't saved anywhere.  This is a major advantage: if you loose yo
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <rect key="contentStretch" x="0.10000000000000001" y="0.20000000000000001" width="0.79999999999999982" height="0.59999999999999964"/>
                                                 </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Personal" lineBreakMode="tailTruncation" minimumFontSize="10" id="kzc-rQ-74F">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Personal Password" lineBreakMode="tailTruncation" minimumFontSize="10" id="kzc-rQ-74F">
                                                     <rect key="frame" x="20" y="120" width="280" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" name="GillSans" family="Gill Sans" pointSize="18"/>
@@ -250,7 +250,7 @@ The passwords aren't saved anywhere.  This is a major advantage: if you loose yo
                                                     <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <size key="shadowOffset" width="0.0" height="1"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="AES-encrypted, backed up with iTunes/iCloud." lineBreakMode="tailTruncation" minimumFontSize="10" id="vNa-Yq-XIJ">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="AES-encrypted, iTunes backup, iCloud sync." lineBreakMode="tailTruncation" minimumFontSize="10" id="vNa-Yq-XIJ">
                                                     <rect key="frame" x="20" y="144" width="280" height="20"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" name="GillSans-Light" family="Gill Sans" pointSize="14"/>
@@ -274,7 +274,7 @@ The passwords aren't saved anywhere.  This is a major advantage: if you loose yo
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <rect key="contentStretch" x="0.10000000000000001" y="0.20000000000000001" width="0.79999999999999982" height="0.59999999999999964"/>
                                                 </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Device Private" lineBreakMode="tailTruncation" minimumFontSize="10" id="2kB-0P-FeR">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Device Private Password" lineBreakMode="tailTruncation" minimumFontSize="10" id="2kB-0P-FeR">
                                                     <rect key="frame" x="20" y="0.0" width="280" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" name="GillSans" family="Gill Sans" pointSize="18"/>
@@ -283,7 +283,7 @@ The passwords aren't saved anywhere.  This is a major advantage: if you loose yo
                                                     <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <size key="shadowOffset" width="0.0" height="1"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="AES-encrypted, not backed up." lineBreakMode="tailTruncation" minimumFontSize="10" id="6S8-9Y-pzj">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="AES-encrypted, stays on this device only." lineBreakMode="tailTruncation" minimumFontSize="10" id="6S8-9Y-pzj">
                                                     <rect key="frame" x="20" y="24" width="280" height="20"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" name="GillSans-Light" family="Gill Sans" pointSize="14"/>
@@ -308,6 +308,107 @@ The passwords aren't saved anywhere.  This is a major advantage: if you loose yo
             </objects>
             <point key="canvasLocation" x="996" y="182"/>
         </scene>
+        <scene sceneID="CAy-bQ-C6H">
+            <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="QZd-tS-GZh" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <tableViewController id="kOI-sP-Sdw" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" rowHeight="30" sectionHeaderHeight="22" sectionFooterHeight="22" id="M67-lE-Qs9">
+                        <rect key="frame" x="0.0" y="0.0" width="150" height="460"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                        <sections>
+                            <tableViewSection id="bkW-yw-n1W">
+                                <cells>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="Rwj-wk-t0i" style="IBUITableViewCellStyleDefault" id="xKQ-NU-gzm">
+                                        <rect key="frame" x="0.0" y="0.0" width="150" height="30"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                            <rect key="frame" x="0.0" y="0.0" width="150" height="29"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Help" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rwj-wk-t0i">
+                                                    <rect key="frame" x="10" y="0.0" width="130" height="29"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="QyJ-9R-TKX" style="IBUITableViewCellStyleDefault" id="HEh-hy-Oxe">
+                                        <rect key="frame" x="0.0" y="30" width="150" height="30"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                            <rect key="frame" x="0.0" y="0.0" width="150" height="29"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="FAQ" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QyJ-9R-TKX">
+                                                    <rect key="frame" x="10" y="0.0" width="130" height="29"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="2ed-5N-kNd" style="IBUITableViewCellStyleDefault" id="jWC-3d-Lyf">
+                                        <rect key="frame" x="0.0" y="60" width="150" height="30"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                            <rect key="frame" x="0.0" y="0.0" width="150" height="29"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Quick Start" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2ed-5N-kNd">
+                                                    <rect key="frame" x="10" y="0.0" width="130" height="29"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="CHx-Q6-JUu" style="IBUITableViewCellStyleDefault" id="FeB-b2-cca">
+                                        <rect key="frame" x="0.0" y="90" width="150" height="30"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                            <rect key="frame" x="0.0" y="0.0" width="150" height="29"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Settings" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="CHx-Q6-JUu">
+                                                    <rect key="frame" x="10" y="0.0" width="130" height="29"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="kOI-sP-Sdw" id="vsf-0U-eMd"/>
+                            <outlet property="delegate" destination="kOI-sP-Sdw" id="utR-L0-FDy"/>
+                        </connections>
+                    </tableView>
+                    <nil key="simulatedStatusBarMetrics"/>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                </tableViewController>
+            </objects>
+            <point key="canvasLocation" x="996" y="785"/>
+        </scene>
         <scene sceneID="U26-Zf-euQ">
             <objects>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="mK2-p1-3zC" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -751,6 +852,7 @@ L4m3P4sSw0rD</string>
                 <relationship kind="outlet" name="contentTipEditIcon" candidateClass="UIImageView"/>
                 <relationship kind="outlet" name="helpContainer" candidateClass="UIView"/>
                 <relationship kind="outlet" name="helpView" candidateClass="UIWebView"/>
+                <relationship kind="outlet" name="menuContainer" candidateClass="UIView"/>
                 <relationship kind="outlet" name="passwordCounter" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="passwordEdit" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="passwordIncrementer" candidateClass="UIButton"/>
diff --git a/MasterPassword/OPAppDelegate.m b/MasterPassword/OPAppDelegate.m
index dd165756..524c70ce 100644
--- a/MasterPassword/OPAppDelegate.m
+++ b/MasterPassword/OPAppDelegate.m
@@ -289,13 +289,17 @@
         
         dbg(@"Updating master key phrase hash to: %@.", self.keyPhraseHashHex);
         [KeyChain addOrUpdateItemForQuery:[OPAppDelegate keyPhraseHashQuery]
-                           withAttributes:[NSDictionary dictionaryWithObject:self.keyPhraseHash
-                                                                      forKey:(__bridge id)kSecValueData]];
+                           withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                                           self.keyPhraseHash,                                      (__bridge id)kSecValueData,
+                                           kSecAttrAccessibleWhenUnlocked,                          (__bridge id)kSecAttrAccessible,
+                                           nil]];
         if ([[OPConfig get].storeKeyPhrase boolValue]) {
             dbg(@"Storing master key phrase in key chain.");
             [KeyChain addOrUpdateItemForQuery:[OPAppDelegate keyPhraseQuery]
-                               withAttributes:[NSDictionary dictionaryWithObject:[keyPhrase dataUsingEncoding:NSUTF8StringEncoding]
-                                                                          forKey:(__bridge id)kSecValueData]];
+                               withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                                               [keyPhrase dataUsingEncoding:NSUTF8StringEncoding],  (__bridge id)kSecValueData,
+                                               kSecAttrAccessibleWhenUnlocked,                      (__bridge id)kSecAttrAccessible,
+                                               nil]];
         }
     }
 }
diff --git a/MasterPassword/OPElementEntity.h b/MasterPassword/OPElementEntity.h
index 0a84458b..21bb93d8 100644
--- a/MasterPassword/OPElementEntity.h
+++ b/MasterPassword/OPElementEntity.h
@@ -14,10 +14,10 @@
 
 @property (nonatomic, retain) NSString *name;
 @property (nonatomic, retain) NSString *mpHashHex;
-@property (nonatomic) int16_t type;
-@property (nonatomic) int16_t uses;
-@property (nonatomic) NSTimeInterval lastUsed;
-@property (nonatomic, readonly) id content;
+@property (nonatomic, assign) int16_t type;
+@property (nonatomic, assign) int16_t uses;
+@property (nonatomic, assign) NSTimeInterval lastUsed;
+@property (nonatomic, retain, readonly) id content;
 
 - (void)use;
 
diff --git a/MasterPassword/OPElementGeneratedEntity.h b/MasterPassword/OPElementGeneratedEntity.h
index fea44bf5..931e41c0 100644
--- a/MasterPassword/OPElementGeneratedEntity.h
+++ b/MasterPassword/OPElementGeneratedEntity.h
@@ -13,6 +13,6 @@
 
 @interface OPElementGeneratedEntity : OPElementEntity
 
-@property (nonatomic) int16_t counter;
+@property (nonatomic, assign) int16_t counter;
 
 @end
diff --git a/MasterPassword/OPElementStoredEntity.h b/MasterPassword/OPElementStoredEntity.h
index 90b8199b..e86a6287 100644
--- a/MasterPassword/OPElementStoredEntity.h
+++ b/MasterPassword/OPElementStoredEntity.h
@@ -13,6 +13,6 @@
 
 @interface OPElementStoredEntity : OPElementEntity
 
-@property (nonatomic, retain) id contentObject;
+@property (nonatomic, retain, readwrite) id content;
 
 @end
diff --git a/MasterPassword/OPElementStoredEntity.m b/MasterPassword/OPElementStoredEntity.m
index ff0e6c0a..fd03f00f 100644
--- a/MasterPassword/OPElementStoredEntity.m
+++ b/MasterPassword/OPElementStoredEntity.m
@@ -7,17 +7,59 @@
 //
 
 #import "OPElementStoredEntity.h"
+#import "OPAppDelegate.h"
 
+@interface OPElementStoredEntity ()
+
+@property (nonatomic, retain, readwrite) id contentObject;
+
+@end
 
 @implementation OPElementStoredEntity
 
 @dynamic contentObject;
 
++ (NSDictionary *)queryForDevicePrivateElementNamed:(NSString *)name {
+    
+    return [KeyChain createQueryForClass:kSecClassGenericPassword
+                              attributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                                          @"DevicePrivate",  (__bridge id)kSecAttrService,
+                                          name,              (__bridge id)kSecAttrAccount,
+                                          nil]
+                                 matches:nil];
+}
+
 - (id)content {
     
     assert(self.type & OPElementTypeClassStored);
+    
+    NSData *encryptedContent;
+    if (self.type == OPElementTypeStoredDevicePrivate)
+        encryptedContent = [KeyChain dataOfItemForQuery:[OPElementStoredEntity queryForDevicePrivateElementNamed:self.name]];
+    else
+        encryptedContent = self.contentObject;
+    
+    NSData *decryptedContent = [encryptedContent decryptWithSymmetricKey:[[OPAppDelegate get].keyPhrase
+                                                                          dataUsingEncoding:NSUTF8StringEncoding]
+                                                              usePadding:YES];
+    return [[NSString alloc] initWithBytes:decryptedContent.bytes length:decryptedContent.length encoding:NSUTF8StringEncoding];
+}
 
-    return self.contentObject;
+- (void)setContent:(id)content {
+    
+    NSData *encryptedContent = [[content description] encryptWithSymmetricKey:[[OPAppDelegate get].keyPhrase
+                                                                               dataUsingEncoding:NSUTF8StringEncoding]
+                                                                   usePadding:YES];
+    
+    if (self.type == OPElementTypeStoredDevicePrivate) {
+        [KeyChain addOrUpdateItemForQuery:[OPElementStoredEntity queryForDevicePrivateElementNamed:self.name]
+                           withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                                           encryptedContent,                                (__bridge id)kSecValueData,
+                                           kSecAttrAccessibleWhenUnlockedThisDeviceOnly,    (__bridge id)kSecAttrAccessible,
+                                           nil]];
+        self.contentObject = nil;
+    } else
+        self.contentObject = encryptedContent;
 }
 
 @end
diff --git a/MasterPassword/OPMainViewController.m b/MasterPassword/OPMainViewController.m
index fb3ddaa4..039959cc 100644
--- a/MasterPassword/OPMainViewController.m
+++ b/MasterPassword/OPMainViewController.m
@@ -369,12 +369,12 @@
             // Not of a type whose content can be edited.
             return;
         
-        if ([((OPElementStoredEntity *) self.activeElement).contentObject isEqual:self.contentField.text])
+        if ([((OPElementStoredEntity *) self.activeElement).content isEqual:self.contentField.text])
             // Content hasn't changed.
             return;
         
         [self updateElement:^{
-            ((OPElementStoredEntity *) self.activeElement).contentObject = self.contentField.text;
+            ((OPElementStoredEntity *) self.activeElement).content = self.contentField.text;
         }];
     }
 }
diff --git a/MasterPassword/OPMenuViewController.h b/MasterPassword/OPMenuViewController.h
new file mode 100644
index 00000000..a0077703
--- /dev/null
+++ b/MasterPassword/OPMenuViewController.h
@@ -0,0 +1,13 @@
+//
+//  OPMenuViewController.h
+//  MasterPassword
+//
+//  Created by Maarten Billemont on 05/02/12.
+//  Copyright (c) 2012 Lyndir. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface OPMenuViewController : UITableViewController
+
+@end
diff --git a/MasterPassword/OPMenuViewController.m b/MasterPassword/OPMenuViewController.m
new file mode 100644
index 00000000..ad10cbd4
--- /dev/null
+++ b/MasterPassword/OPMenuViewController.m
@@ -0,0 +1,22 @@
+//
+//  OPMenuViewController.m
+//  MasterPassword
+//
+//  Created by Maarten Billemont on 05/02/12.
+//  Copyright (c) 2012 Lyndir. All rights reserved.
+//
+
+#import "OPMenuViewController.h"
+
+
+@implementation OPMenuViewController
+
+#pragma mark - Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    if (indexPath.row == 4)
+        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"prefs:root=Apps&path=MasterPassword"]];
+}
+
+@end
diff --git a/MasterPassword/Resources/Tooltips/tip_alert_banana@2x.png b/MasterPassword/Resources/Tooltips/tip_alert_banana@2x.png
index 5779e8fa..aba2f4a2 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_alert_banana@2x.png and b/MasterPassword/Resources/Tooltips/tip_alert_banana@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_alert_black@2x.png b/MasterPassword/Resources/Tooltips/tip_alert_black@2x.png
index 29e0b8df..f5f2da15 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_alert_black@2x.png and b/MasterPassword/Resources/Tooltips/tip_alert_black@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_alert_gray@2x.png b/MasterPassword/Resources/Tooltips/tip_alert_gray@2x.png
index 0c4fa884..ee4488d8 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_alert_gray@2x.png and b/MasterPassword/Resources/Tooltips/tip_alert_gray@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_alert_mercury@2x.png b/MasterPassword/Resources/Tooltips/tip_alert_mercury@2x.png
index db24d996..bb9b661c 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_alert_mercury@2x.png and b/MasterPassword/Resources/Tooltips/tip_alert_mercury@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_alert_teal@2x.png b/MasterPassword/Resources/Tooltips/tip_alert_teal@2x.png
index 718bee02..02098f5a 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_alert_teal@2x.png and b/MasterPassword/Resources/Tooltips/tip_alert_teal@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_alert_wood@2x.png b/MasterPassword/Resources/Tooltips/tip_alert_wood@2x.png
index 06fc923f..aa633efd 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_alert_wood@2x.png and b/MasterPassword/Resources/Tooltips/tip_alert_wood@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_arrow_banana@2x.png b/MasterPassword/Resources/Tooltips/tip_arrow_banana@2x.png
new file mode 100644
index 00000000..da15d6ae
Binary files /dev/null and b/MasterPassword/Resources/Tooltips/tip_arrow_banana@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_arrow_black@2x.png b/MasterPassword/Resources/Tooltips/tip_arrow_black@2x.png
new file mode 100644
index 00000000..e15edc3a
Binary files /dev/null and b/MasterPassword/Resources/Tooltips/tip_arrow_black@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_arrow_gray@2x.png b/MasterPassword/Resources/Tooltips/tip_arrow_gray@2x.png
new file mode 100644
index 00000000..11e4c702
Binary files /dev/null and b/MasterPassword/Resources/Tooltips/tip_arrow_gray@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_arrow_mercury@2x.png b/MasterPassword/Resources/Tooltips/tip_arrow_mercury@2x.png
new file mode 100644
index 00000000..10f18694
Binary files /dev/null and b/MasterPassword/Resources/Tooltips/tip_arrow_mercury@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_arrow_teal@2x.png b/MasterPassword/Resources/Tooltips/tip_arrow_teal@2x.png
new file mode 100644
index 00000000..379d8574
Binary files /dev/null and b/MasterPassword/Resources/Tooltips/tip_arrow_teal@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_arrow_wood@2x.png b/MasterPassword/Resources/Tooltips/tip_arrow_wood@2x.png
new file mode 100644
index 00000000..8c8d223f
Binary files /dev/null and b/MasterPassword/Resources/Tooltips/tip_arrow_wood@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_basic_banana@2x.png b/MasterPassword/Resources/Tooltips/tip_basic_banana@2x.png
index f863cea1..89cd34a8 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_basic_banana@2x.png and b/MasterPassword/Resources/Tooltips/tip_basic_banana@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_basic_black@2x.png b/MasterPassword/Resources/Tooltips/tip_basic_black@2x.png
index 3e568ed2..d14fc099 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_basic_black@2x.png and b/MasterPassword/Resources/Tooltips/tip_basic_black@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_basic_gray@2x.png b/MasterPassword/Resources/Tooltips/tip_basic_gray@2x.png
index f1e1d0d6..722c3b7b 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_basic_gray@2x.png and b/MasterPassword/Resources/Tooltips/tip_basic_gray@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_basic_mercury@2x.png b/MasterPassword/Resources/Tooltips/tip_basic_mercury@2x.png
index 0458e846..40785d35 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_basic_mercury@2x.png and b/MasterPassword/Resources/Tooltips/tip_basic_mercury@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_basic_teal@2x.png b/MasterPassword/Resources/Tooltips/tip_basic_teal@2x.png
index cae0b506..dc8cfe32 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_basic_teal@2x.png and b/MasterPassword/Resources/Tooltips/tip_basic_teal@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_basic_wood@2x.png b/MasterPassword/Resources/Tooltips/tip_basic_wood@2x.png
index 978b3e4b..2f78f428 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_basic_wood@2x.png and b/MasterPassword/Resources/Tooltips/tip_basic_wood@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_download_banana@2x.png b/MasterPassword/Resources/Tooltips/tip_download_banana@2x.png
index ee439bc2..8d938467 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_download_banana@2x.png and b/MasterPassword/Resources/Tooltips/tip_download_banana@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_download_black@2x.png b/MasterPassword/Resources/Tooltips/tip_download_black@2x.png
index cf1dc1fe..3659c8ad 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_download_black@2x.png and b/MasterPassword/Resources/Tooltips/tip_download_black@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_download_gray@2x.png b/MasterPassword/Resources/Tooltips/tip_download_gray@2x.png
index b4621cc7..32f5fd2a 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_download_gray@2x.png and b/MasterPassword/Resources/Tooltips/tip_download_gray@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_download_mercury@2x.png b/MasterPassword/Resources/Tooltips/tip_download_mercury@2x.png
index ba4ac104..ea3b7a9c 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_download_mercury@2x.png and b/MasterPassword/Resources/Tooltips/tip_download_mercury@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_download_teal@2x.png b/MasterPassword/Resources/Tooltips/tip_download_teal@2x.png
index 50dce614..894b721e 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_download_teal@2x.png and b/MasterPassword/Resources/Tooltips/tip_download_teal@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_download_wood@2x.png b/MasterPassword/Resources/Tooltips/tip_download_wood@2x.png
index 3aac9fab..0eed4b24 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_download_wood@2x.png and b/MasterPassword/Resources/Tooltips/tip_download_wood@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_large_banana@2x.png b/MasterPassword/Resources/Tooltips/tip_large_banana@2x.png
index f500bff1..0020caa1 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_large_banana@2x.png and b/MasterPassword/Resources/Tooltips/tip_large_banana@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_large_black@2x.png b/MasterPassword/Resources/Tooltips/tip_large_black@2x.png
index 412b3ae2..d05defef 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_large_black@2x.png and b/MasterPassword/Resources/Tooltips/tip_large_black@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_large_gray@2x.png b/MasterPassword/Resources/Tooltips/tip_large_gray@2x.png
index 16f4c399..a76dfb7b 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_large_gray@2x.png and b/MasterPassword/Resources/Tooltips/tip_large_gray@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_large_mercury@2x.png b/MasterPassword/Resources/Tooltips/tip_large_mercury@2x.png
index 939507e5..8cb93b5e 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_large_mercury@2x.png and b/MasterPassword/Resources/Tooltips/tip_large_mercury@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_large_teal@2x.png b/MasterPassword/Resources/Tooltips/tip_large_teal@2x.png
index af14c26e..98152f92 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_large_teal@2x.png and b/MasterPassword/Resources/Tooltips/tip_large_teal@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_large_wood@2x.png b/MasterPassword/Resources/Tooltips/tip_large_wood@2x.png
index 65be8326..fc0db297 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_large_wood@2x.png and b/MasterPassword/Resources/Tooltips/tip_large_wood@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_location_banana@2x.png b/MasterPassword/Resources/Tooltips/tip_location_banana@2x.png
index 2ba0025c..68b9251a 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_location_banana@2x.png and b/MasterPassword/Resources/Tooltips/tip_location_banana@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_location_black@2x.png b/MasterPassword/Resources/Tooltips/tip_location_black@2x.png
index c7108ffe..6bc25ae5 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_location_black@2x.png and b/MasterPassword/Resources/Tooltips/tip_location_black@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_location_gray@2x.png b/MasterPassword/Resources/Tooltips/tip_location_gray@2x.png
index b29df8be..525356e7 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_location_gray@2x.png and b/MasterPassword/Resources/Tooltips/tip_location_gray@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_location_mercury@2x.png b/MasterPassword/Resources/Tooltips/tip_location_mercury@2x.png
index 660288a4..58e24482 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_location_mercury@2x.png and b/MasterPassword/Resources/Tooltips/tip_location_mercury@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_location_teal@2x.png b/MasterPassword/Resources/Tooltips/tip_location_teal@2x.png
index 38ba297f..17d50f7b 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_location_teal@2x.png and b/MasterPassword/Resources/Tooltips/tip_location_teal@2x.png differ
diff --git a/MasterPassword/Resources/Tooltips/tip_location_wood@2x.png b/MasterPassword/Resources/Tooltips/tip_location_wood@2x.png
index 69d6036b..53838925 100644
Binary files a/MasterPassword/Resources/Tooltips/tip_location_wood@2x.png and b/MasterPassword/Resources/Tooltips/tip_location_wood@2x.png differ