diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 3168cc4b..1ea3b5d0 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -96,7 +96,6 @@
 		4C45FB2D178E0BCB0010007D /* MPDatabaseLoading.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45FB2C178E0BCB0010007D /* MPDatabaseLoading.m */; };
 		4C45FB30178E0CE20010007D /* MPDatabaseCreation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45FB2F178E0CE20010007D /* MPDatabaseCreation.m */; };
 		4C46B88517063A070046109A /* NSString+MPPasswordCreation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */; };
-		4C46B88817063A170046109A /* NSString+PasswordStrength.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88717063A170046109A /* NSString+PasswordStrength.m */; };
 		4C46E09E17673A0A00DA62E8 /* HNHShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */; };
 		4C4A100F176286FD00BBF2CA /* MPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A100E176286FD00BBF2CA /* MPTableView.m */; };
 		4C4A101217629DA900BBF2CA /* KdbGroup+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */; };
@@ -123,6 +122,7 @@
 		4C5FE9AE17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5FE9AD17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m */; };
 		4C61EA0316D2FD0800AC519E /* MPOutlineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61EA0216D2FD0800AC519E /* MPOutlineViewController.m */; };
 		4C61EA0516D2FFE200AC519E /* OutlineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C61EA0416D2FFE200AC519E /* OutlineView.xib */; };
+		4C63B8FB17A3154D0091BD72 /* MPContextToolbarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C63B8FA17A3154D0091BD72 /* MPContextToolbarButton.m */; };
 		4C65C79C16DD283900E32CFF /* MPToolbarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C65C79B16DD283900E32CFF /* MPToolbarButton.m */; };
 		4C65FAE916D16DDB006E0577 /* MPPasswordInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C65FAE716D16DDB006E0577 /* MPPasswordInputController.m */; };
 		4C669B7F16760ED100DD0774 /* AesInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3116760ED100DD0774 /* AesInputStream.m */; };
@@ -189,7 +189,6 @@
 		4C888C9716EB754B003D34A1 /* MPActionHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C888C9616EB754B003D34A1 /* MPActionHelper.m */; };
 		4C8A173D1790AA41008B5C17 /* NSData+Keyfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8A173C1790AA41008B5C17 /* NSData+Keyfile.m */; };
 		4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8FECC716D57E3200BF26CF /* QuartzCore.framework */; };
-		4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C920E2916DCDFA00083839B /* MPLoggerProxy.m */; };
 		4C96D15417A12E4F00D931FA /* 99_CreatedTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C96D15317A12E4F00D931FA /* 99_CreatedTemplate.pdf */; };
 		4C9D6AA917615199001C660C /* HNHRoundedSecureTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */; };
 		4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; };
@@ -428,8 +427,6 @@
 		4C45FB2F178E0CE20010007D /* MPDatabaseCreation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseCreation.m; sourceTree = "<group>"; };
 		4C46B88317063A070046109A /* NSString+MPPasswordCreation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MPPasswordCreation.h"; sourceTree = "<group>"; };
 		4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MPPasswordCreation.m"; sourceTree = "<group>"; };
-		4C46B88617063A170046109A /* NSString+PasswordStrength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+PasswordStrength.h"; sourceTree = "<group>"; };
-		4C46B88717063A170046109A /* NSString+PasswordStrength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+PasswordStrength.m"; sourceTree = "<group>"; };
 		4C46E09C17673A0A00DA62E8 /* HNHShadowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHShadowBox.h; sourceTree = "<group>"; };
 		4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHShadowBox.m; sourceTree = "<group>"; };
 		4C4A100D176286FD00BBF2CA /* MPTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTableView.h; sourceTree = "<group>"; };
@@ -475,6 +472,8 @@
 		4C61EA0116D2FD0800AC519E /* MPOutlineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewController.h; sourceTree = "<group>"; };
 		4C61EA0216D2FD0800AC519E /* MPOutlineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineViewController.m; sourceTree = "<group>"; };
 		4C61EA0416D2FFE200AC519E /* OutlineView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OutlineView.xib; sourceTree = "<group>"; };
+		4C63B8F917A3154D0091BD72 /* MPContextToolbarButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPContextToolbarButton.h; sourceTree = "<group>"; };
+		4C63B8FA17A3154D0091BD72 /* MPContextToolbarButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPContextToolbarButton.m; sourceTree = "<group>"; };
 		4C65C79A16DD283900E32CFF /* MPToolbarButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPToolbarButton.h; sourceTree = "<group>"; };
 		4C65C79B16DD283900E32CFF /* MPToolbarButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarButton.m; sourceTree = "<group>"; };
 		4C65FAE616D16DDB006E0577 /* MPPasswordInputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordInputController.h; sourceTree = "<group>"; };
@@ -606,8 +605,6 @@
 		4C8A173B1790AA41008B5C17 /* NSData+Keyfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Keyfile.h"; sourceTree = "<group>"; };
 		4C8A173C1790AA41008B5C17 /* NSData+Keyfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Keyfile.m"; sourceTree = "<group>"; };
 		4C8FECC716D57E3200BF26CF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		4C920E2816DCDFA00083839B /* MPLoggerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLoggerProxy.h; sourceTree = "<group>"; };
-		4C920E2916DCDFA00083839B /* MPLoggerProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLoggerProxy.m; sourceTree = "<group>"; };
 		4C96D15317A12E4F00D931FA /* 99_CreatedTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_CreatedTemplate.pdf; sourceTree = "<group>"; };
 		4C9D6AA717615199001C660C /* HNHRoundedSecureTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedSecureTextFieldCell.h; sourceTree = "<group>"; };
 		4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundedSecureTextFieldCell.m; sourceTree = "<group>"; };
@@ -800,23 +797,14 @@
 		4C104129178CDD26001B5239 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
+				4C46B88317063A070046109A /* NSString+MPPasswordCreation.h */,
+				4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */,
 				4C10412A178CDD44001B5239 /* NSDate+Humanized.h */,
 				4C10412B178CDD44001B5239 /* NSDate+Humanized.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
 		};
-		4C16BA5F1787997E002B42BD /* ValueTransformer */ = {
-			isa = PBXGroup;
-			children = (
-				4C5BF679175C01F300D53DF7 /* MPUppercaseStringValueTransformer.h */,
-				4C5BF67A175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m */,
-				4CF6C70F176F4533007A811D /* MPStringLengthValueTransformer.h */,
-				4CF6C710176F4533007A811D /* MPStringLengthValueTransformer.m */,
-			);
-			name = ValueTransformer;
-			sourceTree = "<group>";
-		};
 		4C1842D6179C716100E2F5BC /* Format */ = {
 			isa = PBXGroup;
 			children = (
@@ -838,6 +826,17 @@
 			name = Databases;
 			sourceTree = "<group>";
 		};
+		4C217D8E17A32BCF00609FAA /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				4C569D9C17652AC800595B62 /* MPConstants.h */,
+				4C569D9D17652B0600595B62 /* MPConstants.m */,
+				4CCEDE2C179F2122008402BE /* MPNotifications.h */,
+				4CCEDE2D179F213B008402BE /* MPNotifications.m */,
+			);
+			name = Common;
+			sourceTree = "<group>";
+		};
 		4C245A64176E1E3C0086100E /* CocoaHTTPServer */ = {
 			isa = PBXGroup;
 			children = (
@@ -1045,25 +1044,22 @@
 		4C2E382016D141F700037A9D /* Helper */ = {
 			isa = PBXGroup;
 			children = (
-				4C16BA5F1787997E002B42BD /* ValueTransformer */,
+				4C5BF679175C01F300D53DF7 /* MPUppercaseStringValueTransformer.h */,
+				4C5BF67A175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m */,
+				4CF6C70F176F4533007A811D /* MPStringLengthValueTransformer.h */,
+				4CF6C710176F4533007A811D /* MPStringLengthValueTransformer.m */,
 				4C888C9516EB754B003D34A1 /* MPActionHelper.h */,
 				4C888C9616EB754B003D34A1 /* MPActionHelper.m */,
 				4C2E382116D1421B00037A9D /* MPIconHelper.h */,
 				4C2E382216D1421B00037A9D /* MPIconHelper.m */,
-				4C920E2816DCDFA00083839B /* MPLoggerProxy.h */,
-				4C920E2916DCDFA00083839B /* MPLoggerProxy.m */,
 				4CBA2AB617074B59006D8139 /* MPSettingsHelper.h */,
 				4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */,
 				4C01C2401764D8980016D5D0 /* MPContextMenuHelper.h */,
 				4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */,
-				4C569D9C17652AC800595B62 /* MPConstants.h */,
-				4C569D9D17652B0600595B62 /* MPConstants.m */,
 				4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */,
 				4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */,
 				4C16BA6017879A3C002B42BD /* MPPasswordStringFormatter.h */,
 				4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */,
-				4CCEDE2C179F2122008402BE /* MPNotifications.h */,
-				4CCEDE2D179F213B008402BE /* MPNotifications.m */,
 			);
 			name = Helper;
 			sourceTree = "<group>";
@@ -1146,17 +1142,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		4C46B8821706397A0046109A /* Security Additions */ = {
-			isa = PBXGroup;
-			children = (
-				4C46B88317063A070046109A /* NSString+MPPasswordCreation.h */,
-				4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */,
-				4C46B88617063A170046109A /* NSString+PasswordStrength.h */,
-				4C46B88717063A170046109A /* NSString+PasswordStrength.m */,
-			);
-			name = "Security Additions";
-			sourceTree = "<group>";
-		};
 		4C586F9C16D07ABD00E7DB57 /* Icons */ = {
 			isa = PBXGroup;
 			children = (
@@ -1326,9 +1311,9 @@
 		4C77E36C15B84A240093A587 /* MacPass */ = {
 			isa = PBXGroup;
 			children = (
+				4C217D8E17A32BCF00609FAA /* Common */,
 				4C104129178CDD26001B5239 /* Categories */,
 				4C245C11176E22150086100E /* KeepassHttp */,
-				4C46B8821706397A0046109A /* Security Additions */,
 				4C2C4C2516D3BCEA00D49295 /* KeePassLib Categories */,
 				4C2E382016D141F700037A9D /* Helper */,
 				4C586F9C16D07ABD00E7DB57 /* Icons */,
@@ -1581,6 +1566,8 @@
 				4C65C79B16DD283900E32CFF /* MPToolbarButton.m */,
 				4C888C9116EB6F5E003D34A1 /* MPToolbarItem.h */,
 				4C888C9216EB6F5E003D34A1 /* MPToolbarItem.m */,
+				4C63B8F917A3154D0091BD72 /* MPContextToolbarButton.h */,
+				4C63B8FA17A3154D0091BD72 /* MPContextToolbarButton.m */,
 			);
 			name = Controls;
 			sourceTree = "<group>";
@@ -1860,7 +1847,6 @@
 				4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPTreeTools.m in Sources */,
 				4CC1AEBE16D4467C006D2AAB /* KdbTree+MPAdditions.m in Sources */,
 				4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */,
-				4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */,
 				4C65C79C16DD283900E32CFF /* MPToolbarButton.m in Sources */,
 				4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */,
 				4CE8246F16E2E93400573141 /* MPOverlayWindowController.m in Sources */,
@@ -1873,7 +1859,6 @@
 				4CE39ABF16ECE34A000FE29D /* MPIconSelectViewController.m in Sources */,
 				4CE39AC416ECE4F7000FE29D /* MPPopupImageView.m in Sources */,
 				4C46B88517063A070046109A /* NSString+MPPasswordCreation.m in Sources */,
-				4C46B88817063A170046109A /* NSString+PasswordStrength.m in Sources */,
 				4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */,
 				4CE5B54B173AFBA700207B39 /* MPDocument.m in Sources */,
 				4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */,
@@ -1996,6 +1981,7 @@
 				4CCEDE2E179F213B008402BE /* MPNotifications.m in Sources */,
 				4CCEDE32179F5B6C008402BE /* KPKDataStreamer.m in Sources */,
 				4C17D8E517A1C780006C8C1E /* MPDocumentWindowDelegate.m in Sources */,
+				4C63B8FB17A3154D0091BD72 /* MPContextToolbarButton.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index d7bbf8dd..b8fc0510 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -52,15 +52,83 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSView" id="87082330">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSCustomView" id="816254670">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<array class="NSMutableArray" key="NSSubviews"/>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="NSImageView" id="687987001">
+								<reference key="NSNextResponder" ref="816254670"/>
+								<int key="NSvFlags">268</int>
+								<set class="NSMutableSet" key="NSDragTypes">
+									<string>Apple PDF pasteboard type</string>
+									<string>Apple PICT pasteboard type</string>
+									<string>Apple PNG pasteboard type</string>
+									<string>NSFilenamesPboardType</string>
+									<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+									<string>NeXT TIFF v4.0 pasteboard type</string>
+								</set>
+								<string key="NSFrame">{{138, 7}, {16, 16}}</string>
+								<reference key="NSSuperview" ref="816254670"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSImageCell" key="NSCell" id="16993625">
+									<int key="NSCellFlags">134217728</int>
+									<int key="NSCellFlags2">33554432</int>
+									<object class="NSCustomResource" key="NSContents">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">07_NotepadTemplate</string>
+									</object>
+									<string key="NSCellIdentifier">_NS:9</string>
+									<int key="NSAlign">0</int>
+									<int key="NSScale">0</int>
+									<int key="NSStyle">0</int>
+									<bool key="NSAnimates">NO</bool>
+								</object>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<bool key="NSEditable">YES</bool>
+							</object>
+							<object class="NSImageView" id="47551316">
+								<reference key="NSNextResponder" ref="816254670"/>
+								<int key="NSvFlags">268</int>
+								<set class="NSMutableSet" key="NSDragTypes">
+									<string>Apple PDF pasteboard type</string>
+									<string>Apple PICT pasteboard type</string>
+									<string>Apple PNG pasteboard type</string>
+									<string>NSFilenamesPboardType</string>
+									<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+									<string>NeXT TIFF v4.0 pasteboard type</string>
+								</set>
+								<string key="NSFrame">{{20, 7}, {16, 16}}</string>
+								<reference key="NSSuperview" ref="816254670"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="687987001"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSImageCell" key="NSCell" id="982440531">
+									<int key="NSCellFlags">134217728</int>
+									<int key="NSCellFlags2">33554432</int>
+									<object class="NSCustomResource" key="NSContents">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">99_CreatedTemplate</string>
+									</object>
+									<string key="NSCellIdentifier">_NS:9</string>
+									<int key="NSAlign">0</int>
+									<int key="NSScale">0</int>
+									<int key="NSStyle">0</int>
+									<bool key="NSAnimates">NO</bool>
+								</object>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<bool key="NSEditable">YES</bool>
+							</object>
+						</array>
 						<string key="NSFrameSize">{293, 30}</string>
 						<reference key="NSSuperview" ref="87082330"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="47551316"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSClassName">HNHGradientView</string>
 					</object>
@@ -69,6 +137,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{85, 496}, {124, 25}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="816254670"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -119,6 +188,7 @@
 						<int key="NSvFlags">12</int>
 						<string key="NSFrame">{{0, 31}, {293, 466}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="1002013291">
@@ -425,6 +495,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{241, 429}, {32, 19}}</string>
 											<reference key="NSSuperview" ref="177600245"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="892620201"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -450,6 +521,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 432}, {80, 14}}</string>
 											<reference key="NSSuperview" ref="177600245"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="966066653"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
@@ -479,6 +551,7 @@
 															<array class="NSMutableArray" key="NSSubviews"/>
 															<string key="NSFrameSize">{259, 400}</string>
 															<reference key="NSSuperview" ref="236190992"/>
+															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="291769955"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<bool key="NSEnabled">YES</bool>
@@ -541,6 +614,7 @@
 													</array>
 													<string key="NSFrame">{{1, 1}, {259, 400}}</string>
 													<reference key="NSSuperview" ref="892620201"/>
+													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="441697535"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
 													<reference key="NSDocView" ref="441697535"/>
@@ -552,6 +626,7 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 													<reference key="NSSuperview" ref="892620201"/>
+													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="1045948787"/>
 													<string key="NSReuseIdentifierKey">_NS:58</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -564,7 +639,8 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 119}, {223, 15}}</string>
 													<reference key="NSSuperview" ref="892620201"/>
-													<reference key="NSNextKeyView" ref="166081160"/>
+													<reference key="NSWindow"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">1</int>
@@ -575,6 +651,7 @@
 											</array>
 											<string key="NSFrame">{{16, 20}, {261, 402}}</string>
 											<reference key="NSSuperview" ref="177600245"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="236190992"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133681</int>
@@ -589,6 +666,7 @@
 									</array>
 									<string key="NSFrameSize">{293, 466}</string>
 									<reference key="NSSuperview" ref="166081160"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="40836012"/>
 								</object>
 								<string key="NSLabel">Fields</string>
@@ -606,11 +684,13 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{293, 529}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="166081160"/>
 				<string key="NSReuseIdentifierKey">_NS:11</string>
 			</object>
 			<object class="NSCustomView" id="581195218">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTextField" id="564843810">
@@ -618,6 +698,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 288}, {35, 14}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="850153963"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -665,6 +746,7 @@
 										</set>
 										<string key="NSFrameSize">{210, 258}</string>
 										<reference key="NSSuperview" ref="454120122"/>
+										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="657519150"/>
 										<string key="NSReuseIdentifierKey">_NS:13</string>
 										<object class="NSTextContainer" key="NSTextContainer" id="77792568">
@@ -686,7 +768,7 @@
 											<int key="NSTCFlags">1</int>
 										</object>
 										<object class="NSTextViewSharedData" key="NSSharedData">
-											<int key="NSFlags">100675459</int>
+											<int key="NSFlags">67121027</int>
 											<int key="NSTextCheckingTypes">0</int>
 											<nil key="NSMarkedAttributes"/>
 											<reference key="NSBackgroundColor" ref="566946319"/>
@@ -727,6 +809,7 @@
 								</array>
 								<string key="NSFrame">{{1, 1}, {210, 258}}</string>
 								<reference key="NSSuperview" ref="850153963"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="569376381"/>
 								<string key="NSReuseIdentifierKey">_NS:11</string>
 								<reference key="NSDocView" ref="569376381"/>
@@ -757,6 +840,7 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{195, 1}, {16, 258}}</string>
 								<reference key="NSSuperview" ref="850153963"/>
+								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:83</string>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="850153963"/>
@@ -768,6 +852,7 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="850153963"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="454120122"/>
 								<string key="NSReuseIdentifierKey">_NS:33</string>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -780,6 +865,7 @@
 						</array>
 						<string key="NSFrame">{{20, 20}, {212, 260}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="454120122"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="NSsFlags">133138</int>
@@ -795,6 +881,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{201, 334}, {31, 25}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="172507372"/>
 						<string key="NSReuseIdentifierKey">_NS:22</string>
 						<bool key="NSEnabled">YES</bool>
@@ -823,6 +910,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 336}, {173, 22}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1035439471"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -857,6 +945,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 309}, {212, 19}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="564843810"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSHuggingPriority">{250, 750}</string>
@@ -882,6 +971,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 366}, {58, 14}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="685310174"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -902,6 +992,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 418}, {25, 14}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="484293743"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -922,6 +1013,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 388}, {212, 22}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="279643156"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -943,6 +1035,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 440}, {212, 22}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="428053603"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -964,6 +1057,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 470}, {58, 14}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="800408621"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -984,6 +1078,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 492}, {212, 22}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="328122838"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -1005,6 +1100,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 522}, {35, 14}}</string>
 						<reference key="NSSuperview" ref="581195218"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="909883915"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -1022,6 +1118,8 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{252, 553}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="734056912"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">HNHScrollDocumentViewAdapter</string>
@@ -1197,6 +1295,22 @@
 					</object>
 					<int key="connectionID">2561</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">createdImageView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="47551316"/>
+					</object>
+					<int key="connectionID">2661</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">modifiedImageView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="687987001"/>
+					</object>
+					<int key="connectionID">2662</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">imageView</string>
@@ -1767,6 +1881,86 @@
 						<int key="objectID">662</int>
 						<reference key="object" ref="816254670"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="808022187">
+								<reference key="firstItem" ref="687987001"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="47551316"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1056081142">
+								<reference key="firstItem" ref="687987001"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="816254670"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="300007741">
+								<reference key="firstItem" ref="687987001"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="816254670"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="402635443">
+								<reference key="firstItem" ref="687987001"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="47551316"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="60523924">
+								<reference key="firstItem" ref="47551316"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="816254670"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="574545128">
 								<reference key="firstItem" ref="816254670"/>
 								<int key="firstAttribute">8</int>
@@ -1783,6 +1977,8 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
 							</object>
+							<reference ref="47551316"/>
+							<reference ref="687987001"/>
 						</array>
 						<reference key="parent" ref="87082330"/>
 					</object>
@@ -4588,6 +4784,120 @@
 						<reference key="object" ref="421684971"/>
 						<reference key="parent" ref="292493070"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2632</int>
+						<reference key="object" ref="47551316"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="982440531"/>
+							<object class="IBNSLayoutConstraint" id="38589138">
+								<reference key="firstItem" ref="47551316"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="47551316"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="458335359">
+								<reference key="firstItem" ref="47551316"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="47551316"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2633</int>
+						<reference key="object" ref="982440531"/>
+						<reference key="parent" ref="47551316"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2646</int>
+						<reference key="object" ref="458335359"/>
+						<reference key="parent" ref="47551316"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2648</int>
+						<reference key="object" ref="38589138"/>
+						<reference key="parent" ref="47551316"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2649</int>
+						<reference key="object" ref="60523924"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2651</int>
+						<reference key="object" ref="687987001"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="269961098">
+								<reference key="firstItem" ref="687987001"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="687987001"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<reference ref="16993625"/>
+						</array>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2652</int>
+						<reference key="object" ref="269961098"/>
+						<reference key="parent" ref="687987001"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2654</int>
+						<reference key="object" ref="16993625"/>
+						<reference key="parent" ref="687987001"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2655</int>
+						<reference key="object" ref="402635443"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2656</int>
+						<reference key="object" ref="300007741"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2657</int>
+						<reference key="object" ref="1056081142"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2658</int>
+						<reference key="object" ref="808022187"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4999,6 +5309,27 @@
 				<string key="2555.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2557.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2559.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2632.IBNSViewMetadataConstraints">
+					<reference ref="458335359"/>
+					<reference ref="38589138"/>
+				</array>
+				<boolean value="NO" key="2632.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2632.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2633.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2646.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2648.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2649.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2651.IBNSViewMetadataConstraints">
+					<reference ref="269961098"/>
+				</array>
+				<boolean value="NO" key="2651.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2651.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2654.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2655.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2656.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2657.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2658.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="455.IBNSViewMetadataConstraints">
 					<reference ref="895763818"/>
 					<reference ref="7989516"/>
@@ -5015,6 +5346,11 @@
 				<string key="455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="662.IBNSViewMetadataConstraints">
 					<reference ref="574545128"/>
+					<reference ref="60523924"/>
+					<reference ref="402635443"/>
+					<reference ref="300007741"/>
+					<reference ref="1056081142"/>
+					<reference ref="808022187"/>
 				</array>
 				<boolean value="NO" key="662.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="662.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5026,7 +5362,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2631</int>
+			<int key="maxID">2662</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5120,6 +5456,7 @@
 					<string key="className">MPInspectorViewController</string>
 					<string key="superclassName">MPViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="_popUpPasswordGenerator:">id</string>
 						<string key="addAttachment:">id</string>
 						<string key="addCustomField:">id</string>
 						<string key="edit:">id</string>
@@ -5129,6 +5466,10 @@
 						<string key="saveAttachment:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="_popUpPasswordGenerator:">
+							<string key="name">_popUpPasswordGenerator:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="addAttachment:">
 							<string key="name">addAttachment:</string>
 							<string key="candidateClassName">id</string>
@@ -5162,6 +5503,7 @@
 						<string key="URLTextField">NSTextField</string>
 						<string key="attachmentTableView">NSTableView</string>
 						<string key="bottomBar">HNHGradientView</string>
+						<string key="createdImageView">NSImageView</string>
 						<string key="createdTextField">NSTextField</string>
 						<string key="customFieldsTableView">NSTableView</string>
 						<string key="customFieldsTextField">NSTextField</string>
@@ -5170,6 +5512,7 @@
 						<string key="infoTabControl">NSSegmentedControl</string>
 						<string key="itemImageView">MPPopupImageView</string>
 						<string key="itemNameTextfield">NSTextField</string>
+						<string key="modifiedImageView">NSImageView</string>
 						<string key="modifiedTextField">NSTextField</string>
 						<string key="notesTextView">NSTextView</string>
 						<string key="passwordTextField">HNHRoundedSecureTextField</string>
@@ -5192,6 +5535,10 @@
 							<string key="name">bottomBar</string>
 							<string key="candidateClassName">HNHGradientView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="createdImageView">
+							<string key="name">createdImageView</string>
+							<string key="candidateClassName">NSImageView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="createdTextField">
 							<string key="name">createdTextField</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -5224,6 +5571,10 @@
 							<string key="name">itemNameTextfield</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="modifiedImageView">
+							<string key="name">modifiedImageView</string>
+							<string key="candidateClassName">NSImageView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="modifiedTextField">
 							<string key="name">modifiedTextField</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -5317,7 +5668,9 @@
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="00_PasswordTemplate">{128, 128}</string>
 			<string key="04_KlipperTemplate">{128, 128}</string>
+			<string key="07_NotepadTemplate">{128, 128}</string>
 			<string key="26_FileSaveTemplate">{128, 128}</string>
+			<string key="99_CreatedTemplate">{128, 128}</string>
 			<string key="NSActionTemplate">{15, 15}</string>
 			<string key="NSAddTemplate">{8, 8}</string>
 			<string key="NSQuickLookTemplate">{21, 16}</string>
diff --git a/MacPass/IconSelection.xib b/MacPass/IconSelection.xib
index 20d12c6d..6aba471d 100644
--- a/MacPass/IconSelection.xib
+++ b/MacPass/IconSelection.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
+		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -48,7 +48,6 @@
 						<string key="NSFrame">{{147, 18}, {118, 25}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:22</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="619274271">
@@ -183,7 +182,6 @@
 						<string key="NSFrame">{{10, 10}, {40, 40}}</string>
 						<reference key="NSSuperview" ref="340719917"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="344314901">
@@ -619,13 +617,24 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">129</int>
+			<int key="maxID">133</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">MPIconSelectViewController</string>
 					<string key="superclassName">MPViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">useDefault:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">useDefault:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">useDefault:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">iconCollectionView</string>
 						<string key="NS.object.0">NSCollectionView</string>
diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h
index 1707fa6c..1aba807a 100644
--- a/MacPass/MPInspectorViewController.h
+++ b/MacPass/MPInspectorViewController.h
@@ -34,6 +34,8 @@
 @property (unsafe_unretained) IBOutlet NSTextView *notesTextView;
 @property (weak) IBOutlet NSTextField *customFieldsTextField;
 @property (weak) IBOutlet NSButton *togglePassword;
+@property (weak) IBOutlet NSImageView *modifiedImageView;
+@property (weak) IBOutlet NSImageView *createdImageView;
 
 
 @property (weak, nonatomic, readonly) KdbEntry *selectedEntry;
diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index 9c322fe1..64ef00e2 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -107,7 +107,9 @@ enum {
 }
 
 - (void)didLoadView {
-
+  
+  /* ScrollView setup for the General Tab */
+  
   HNHScrollView *scrollView = [[HNHScrollView alloc] init];
   scrollView.actAsFlipped = NO;
   [scrollView setHasVerticalScroller:YES];
@@ -125,25 +127,30 @@ enum {
   
   NSDictionary *views = NSDictionaryOfVariableBindings(_generalView, scrollView);
   [[scrollView superview] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[scrollView]|"
-                                                                      options:0
-                                                                      metrics:nil
-                                                                        views:views ]];
+                                                                                 options:0
+                                                                                 metrics:nil
+                                                                                   views:views ]];
   [[scrollView superview] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-3-[scrollView]-50-|"
-                                                                      options:0
-                                                                      metrics:nil
-                                                                        views:views]];
+                                                                                 options:0
+                                                                                 metrics:nil
+                                                                                   views:views]];
   [clipView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_generalView]|"
-                                                                      options:0
-                                                                      metrics:nil
-                                                                        views:views]];
+                                                                   options:0
+                                                                   metrics:nil
+                                                                     views:views]];
   [[self view] layoutSubtreeIfNeeded];
   
   
-  //[self.scrollContentView setAutoresizingMask:NSViewWidthSizable];
+  /* Setup ImageView Background styles */
   [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
   [self.itemImageView setTarget:self];
+  [[self.createdImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
+  [[self.modifiedImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
   [_bottomBar setBorderType:HNHBorderTop];
   
+  
+  
+  
   [_infoTabControl bind:NSSelectedIndexBinding toObject:self withKeyPath:@"activeTab" options:nil];
   [_tabView bind:NSSelectedIndexBinding  toObject:self withKeyPath:@"activeTab" options:nil];
   
@@ -190,10 +197,10 @@ enum {
   
   NSString *creationString = [self.creationDate humanized];
   NSString *modificationString = [self.modificationDate humanized];
-
+  
   NSString *modifedAtTemplate = NSLocalizedString(@"MODIFED_AT_%@", @"Modifed at template string. %@ is replaced by locaized date and time");
   NSString *createdAtTemplate = NSLocalizedString(@"CREATED_AT_%@", @"Created at template string. %@ is replaced by locaized date and time");
-
+  
   [self.modifiedTextField setStringValue:[NSString stringWithFormat:modifedAtTemplate, modificationString]];
   [self.createdTextField setStringValue:[NSString stringWithFormat:createdAtTemplate, creationString]];
   
@@ -450,7 +457,7 @@ enum {
   [self.titleTextField setSelectable:YES];
   [self.usernameTextField setEditable:NO];
   [self.usernameTextField setSelectable:YES];
-
+  
 }
 
 #pragma mark Notificiations
diff --git a/MacPass/MPToolbarButton.m b/MacPass/MPToolbarButton.m
index d94c0cac..47e8eeb3 100644
--- a/MacPass/MPToolbarButton.m
+++ b/MacPass/MPToolbarButton.m
@@ -14,6 +14,10 @@
   self = [super initWithFrame:frameRect];
   if(self) {
     [self setFocusRingType:NSFocusRingTypeNone];
+    [[self cell] setBezelStyle:NSTexturedRoundedBezelStyle];
+    [[self cell] setImageScaling:NSImageScaleProportionallyDown];
+    [self setButtonType:NSMomentaryPushInButton];
+    [self setImagePosition:NSImageOnly];
   }
   return self;
 }
diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index 1bf08f96..21b9c4df 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -13,6 +13,7 @@
 #import "MPToolbarItem.h"
 #import "MPActionHelper.h"
 #import "MPContextMenuHelper.h"
+#import "MPContextToolbarButton.h"
 
 NSString *const MPToolbarItemLock = @"TOOLBAR_LOCK";
 NSString *const MPToolbarItemAddGroup = @"TOOLBAR_ADD_GROUP";
@@ -81,16 +82,35 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
       [item setMenuFormRepresentation:menuRepresentation];
       [item setView:popupButton];
     }
-    else {
-      NSButton *button = [[MPToolbarButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)];
-      [[button cell] setBezelStyle:NSTexturedRoundedBezelStyle];
-      [[button cell] setImageScaling:NSImageScaleProportionallyDown];
-      [button setTitle:itemIdentifier];
-      [button setButtonType:NSMomentaryPushInButton];
+    else if( [itemIdentifier isEqualToString:MPToolbarItemAddEntry]) {
+      MPContextToolbarButton *button = [[MPContextToolbarButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)];
+      NSImage *image = self.toolbarImages[itemIdentifier];
+      [image setSize:NSMakeSize(16, 16)];
+      [button setImage:image];
+      [button sizeToFit];
+      [button setAction:[self _actionForToolbarItemIdentifier:itemIdentifier]];
+      
+      NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
+      [menu addItemWithTitle:@"Test" action:NULL keyEquivalent:@""];
+      [menu addItemWithTitle:@"More" action:NULL keyEquivalent:@""];
+      [button setMenu:menu];
+      
+      
+      NSRect fittingRect = [button frame];
+      fittingRect.size.width = MAX( (CGFloat)32.0,fittingRect.size.width);
+      [button setFrame:fittingRect];
+      [item setView:button];
+      NSMenuItem *menuRepresentation = [[NSMenuItem alloc] initWithTitle:itemLabel
+                                                                  action:[self _actionForToolbarItemIdentifier:itemIdentifier]
+                                                           keyEquivalent:@""];
+      [item setMenuFormRepresentation:menuRepresentation];
+      
+    }
+    else {
+      NSButton *button = [[MPToolbarButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)];
       NSImage *image = self.toolbarImages[itemIdentifier];
       [image setSize:NSMakeSize(16, 16)];
       [button setImage:image];
-      [button setImagePosition:NSImageOnly];
       [button sizeToFit];
       [button setAction:[self _actionForToolbarItemIdentifier:itemIdentifier]];