From 361b405825550bcc9ee037376b186ceb42065e00 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Tue, 26 Feb 2013 20:57:25 +0100
Subject: [PATCH] Added MPToolbarButton to handle small control size in Toolbar
 EntryEditView now gets displayed (without any functionality)

---
 MacPass.xcodeproj/project.pbxproj       |   12 +
 MacPass/EntryEditView.xib               | 1241 ++++++++++++++++++-----
 MacPass/FilterBar.xib                   |   59 +-
 MacPass/MPDatabaseController.h          |    1 +
 MacPass/MPDatabaseController.m          |    4 +
 MacPass/MPEntryEditController.h         |    5 +
 MacPass/MPEntryEditController.m         |   27 +-
 MacPass/MPEntryViewController.m         |   48 +-
 MacPass/MPGradientView.m                |    8 +-
 MacPass/MPLoggerProxy.h                 |   16 +
 MacPass/MPLoggerProxy.m                 |   35 +
 MacPass/MPMainWindowController.h        |    6 -
 MacPass/MPMainWindowController.m        |   40 +-
 MacPass/MPMainWindowSplitViewDelegate.m |   14 +-
 MacPass/MPOutlineViewController.m       |   16 +-
 MacPass/MPPasswordInputController.m     |   14 +-
 MacPass/MPToolbarButton.h               |   18 +
 MacPass/MPToolbarButton.m               |   36 +
 MacPass/MPToolbarDelegate.m             |   24 +-
 MacPass/MacPass-Info.plist              |    2 +-
 MacPass/PasswordInputView.xib           |   80 +-
 MacPass/SettingsWindow.xib              |    4 +-
 22 files changed, 1274 insertions(+), 436 deletions(-)
 create mode 100644 MacPass/MPLoggerProxy.h
 create mode 100644 MacPass/MPLoggerProxy.m
 create mode 100644 MacPass/MPToolbarButton.h
 create mode 100644 MacPass/MPToolbarButton.m

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 04afd314..9b1e1f48 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -25,6 +25,7 @@
 		4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */; };
 		4C61EA0316D2FD0800AC519E /* MPOutlineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61EA0216D2FD0800AC519E /* MPOutlineViewController.m */; };
 		4C61EA0516D2FFE200AC519E /* OutlineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C61EA0416D2FFE200AC519E /* OutlineView.xib */; };
+		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 */; };
 		4C669B8016760ED100DD0774 /* AesOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3316760ED100DD0774 /* AesOutputStream.m */; };
@@ -72,6 +73,7 @@
 		4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37B15B84A240093A587 /* MainMenu.xib */; };
 		4C83814215BF4677001AE468 /* MPMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPMainWindowController.m */; };
 		4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8FECC716D57E3200BF26CF /* QuartzCore.framework */; };
+		4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C920E2916DCDFA00083839B /* MPLoggerProxy.m */; };
 		4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; };
 		4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */; };
 		4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; };
@@ -125,6 +127,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>"; };
+		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>"; };
 		4C65FAE716D16DDB006E0577 /* MPPasswordInputController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordInputController.m; sourceTree = "<group>"; };
 		4C669B3016760ED100DD0774 /* AesInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesInputStream.h; sourceTree = "<group>"; };
@@ -222,6 +226,8 @@
 		4C83814015BF4677001AE468 /* MPMainWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMainWindowController.h; sourceTree = "<group>"; };
 		4C83814115BF4677001AE468 /* MPMainWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMainWindowController.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>"; };
 		4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindow.xib; sourceTree = "<group>"; };
 		4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralSettings.xib; sourceTree = "<group>"; };
 		4CA0B2F715BCAF6700654E32 /* MPGeneralSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGeneralSettingsController.h; sourceTree = "<group>"; };
@@ -300,6 +306,8 @@
 				4C16854316D704980027ECBC /* MPPathBar.m */,
 				4C6DA0F716D81B8A0011224B /* MPPathBarItemView.h */,
 				4C6DA0F816D81B8A0011224B /* MPPathBarItemView.m */,
+				4C65C79A16DD283900E32CFF /* MPToolbarButton.h */,
+				4C65C79B16DD283900E32CFF /* MPToolbarButton.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -320,6 +328,8 @@
 			children = (
 				4C2E382116D1421B00037A9D /* MPIconHelper.h */,
 				4C2E382216D1421B00037A9D /* MPIconHelper.m */,
+				4C920E2816DCDFA00083839B /* MPLoggerProxy.h */,
+				4C920E2916DCDFA00083839B /* MPLoggerProxy.m */,
 			);
 			name = Helper;
 			sourceTree = "<group>";
@@ -792,6 +802,8 @@
 				4CF5D49616D5B6E900CB78BD /* MPEntryEditController.m in Sources */,
 				4C16854416D704980027ECBC /* MPPathBar.m in Sources */,
 				4C6DA0F916D81B8A0011224B /* MPPathBarItemView.m in Sources */,
+				4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */,
+				4C65C79C16DD283900E32CFF /* MPToolbarButton.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacPass/EntryEditView.xib b/MacPass/EntryEditView.xib
index 2231f22e..152df865 100644
--- a/MacPass/EntryEditView.xib
+++ b/MacPass/EntryEditView.xib
@@ -19,18 +19,19 @@
 			<string>NSCustomView</string>
 			<string>NSDatePicker</string>
 			<string>NSDatePickerCell</string>
-			<string>NSImageCell</string>
-			<string>NSImageView</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
 			<string>NSPopUpButton</string>
 			<string>NSPopUpButtonCell</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
 			<string>NSSecureTextField</string>
 			<string>NSSecureTextFieldCell</string>
 			<string>NSTabView</string>
 			<string>NSTabViewItem</string>
 			<string>NSTextField</string>
 			<string>NSTextFieldCell</string>
+			<string>NSTextView</string>
 			<string>NSView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
@@ -57,9 +58,10 @@
 					<object class="NSTabView" id="621279799">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">12</int>
-						<string key="NSFrame">{{13, 10}, {482, 597}}</string>
+						<string key="NSFrame">{{13, 10}, {411, 461}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="709543686"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="66471917">
@@ -71,7 +73,7 @@
 										<object class="NSTextField" id="24428163">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{168, 497}, {190, 22}}</string>
+											<string key="NSFrame">{{133, 361}, {190, 22}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="612850785"/>
@@ -93,7 +95,7 @@
 													<int key="NSColorSpace">6</int>
 													<string key="NSCatalogName">System</string>
 													<string key="NSColorName">textBackgroundColor</string>
-													<object class="NSColor" key="NSColor">
+													<object class="NSColor" key="NSColor" id="950289736">
 														<int key="NSColorSpace">3</int>
 														<bytes key="NSWhite">MQA</bytes>
 													</object>
@@ -113,7 +115,7 @@
 										<object class="NSTextField" id="968543019">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{131, 500}, {32, 17}}</string>
+											<string key="NSFrame">{{96, 364}, {32, 17}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="24428163"/>
@@ -147,7 +149,7 @@
 										<object class="NSTextField" id="169137344">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{168, 465}, {190, 22}}</string>
+											<string key="NSFrame">{{133, 329}, {190, 22}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="556375611"/>
@@ -169,7 +171,7 @@
 										<object class="NSTextField" id="612850785">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{96, 468}, {67, 17}}</string>
+											<string key="NSFrame">{{61, 332}, {67, 17}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="169137344"/>
@@ -190,7 +192,7 @@
 										<object class="NSTextField" id="556375611">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{98, 435}, {64, 16}}</string>
+											<string key="NSFrame">{{63, 299}, {64, 16}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="650790040"/>
@@ -211,7 +213,7 @@
 										<object class="NSButton" id="96227468">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{165, 331}, {132, 18}}</string>
+											<string key="NSFrame">{{130, 195}, {132, 18}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="854364879"/>
@@ -244,7 +246,7 @@
 										<object class="NSSecureTextField" id="650790040">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{167, 433}, {191, 22}}</string>
+											<string key="NSFrame">{{132, 297}, {191, 22}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="364635018"/>
@@ -269,7 +271,7 @@
 										<object class="NSSecureTextField" id="752387013">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{168, 401}, {190, 22}}</string>
+											<string key="NSFrame">{{133, 265}, {190, 22}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="838479747"/>
@@ -294,7 +296,7 @@
 										<object class="NSDatePicker" id="538156799">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{167, 303}, {104, 27}}</string>
+											<string key="NSFrame">{{132, 167}, {104, 27}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="316610385"/>
@@ -347,7 +349,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSTextField" id="364635018">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{52, 403}, {111, 17}}</string>
+											<string key="NSFrame">{{17, 267}, {111, 17}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="752387013"/>
@@ -368,7 +370,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSTextField" id="854364879">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{61, 307}, {102, 17}}</string>
+											<string key="NSFrame">{{26, 170}, {102, 17}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="538156799"/>
@@ -389,7 +391,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSButton" id="838479747">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{166, 377}, {119, 18}}</string>
+											<string key="NSFrame">{{131, 241}, {119, 18}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="96227468"/>
@@ -416,7 +418,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSPopUpButton" id="316610385">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{273, 301}, {88, 26}}</string>
+											<string key="NSFrame">{{238, 165}, {88, 26}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="852804085"/>
@@ -492,7 +494,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSPopUpButton" id="849363736">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{164, 524}, {100, 26}}</string>
+											<string key="NSFrame">{{129, 388}, {100, 26}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="968543019"/>
@@ -562,7 +564,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSTextField" id="277125192">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{132, 529}, {31, 17}}</string>
+											<string key="NSFrame">{{97, 393}, {31, 17}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="849363736"/>
@@ -583,7 +585,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSButton" id="852804085">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{420, 301}, {29, 26}}</string>
+											<string key="NSFrame">{{349, 163}, {29, 26}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="583222117"/>
@@ -613,42 +615,687 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 													<reference key="NSNextResponder" ref="583222117"/>
 													<int key="NSvFlags">274</int>
 													<array class="NSMutableArray" key="NSSubviews">
-														<object class="NSTextField" id="65853905">
+														<object class="NSScrollView" id="648985862">
 															<reference key="NSNextResponder" ref="283271893"/>
-															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{18, 14}, {404, 205}}</string>
+															<int key="NSvFlags">256</int>
+															<array class="NSMutableArray" key="NSSubviews">
+																<object class="NSClipView" id="424519753">
+																	<reference key="NSNextResponder" ref="648985862"/>
+																	<int key="NSvFlags">2304</int>
+																	<array class="NSMutableArray" key="NSSubviews">
+																		<object class="NSTextView" id="798371442">
+																			<reference key="NSNextResponder" ref="424519753"/>
+																			<int key="NSvFlags">2322</int>
+																			<set class="NSMutableSet" key="NSDragTypes">
+																				<string>Apple HTML pasteboard type</string>
+																				<string>Apple PDF pasteboard type</string>
+																				<string>Apple PICT pasteboard type</string>
+																				<string>Apple PNG pasteboard type</string>
+																				<string>Apple URL pasteboard type</string>
+																				<string>CorePasteboardFlavorType 0x6D6F6F76</string>
+																				<string>NSColor pasteboard type</string>
+																				<string>NSFilenamesPboardType</string>
+																				<string>NSStringPboardType</string>
+																				<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+																				<string>NeXT RTFD pasteboard type</string>
+																				<string>NeXT Rich Text Format v1.0 pasteboard type</string>
+																				<string>NeXT TIFF v4.0 pasteboard type</string>
+																				<string>NeXT font pasteboard type</string>
+																				<string>NeXT ruler pasteboard type</string>
+																				<string>WebURLsWithTitlesPboardType</string>
+																				<string>public.url</string>
+																			</set>
+																			<string key="NSFrameSize">{333, 62}</string>
+																			<reference key="NSSuperview" ref="424519753"/>
+																			<reference key="NSWindow"/>
+																			<reference key="NSNextKeyView" ref="668517472"/>
+																			<string key="NSReuseIdentifierKey">_NS:13</string>
+																			<object class="NSTextContainer" key="NSTextContainer" id="776139976">
+																				<object class="NSLayoutManager" key="NSLayoutManager">
+																					<object class="NSTextStorage" key="NSTextStorage">
+																						<object class="NSMutableString" key="NSString">
+																							<characters key="NS.bytes"/>
+																						</object>
+																						<nil key="NSDelegate"/>
+																					</object>
+																					<array class="NSMutableArray" key="NSTextContainers">
+																						<reference ref="776139976"/>
+																					</array>
+																					<int key="NSLMFlags">38</int>
+																					<nil key="NSDelegate"/>
+																				</object>
+																				<reference key="NSTextView" ref="798371442"/>
+																				<double key="NSWidth">333</double>
+																				<int key="NSTCFlags">1</int>
+																			</object>
+																			<object class="NSTextViewSharedData" key="NSSharedData">
+																				<int key="NSFlags">1073745667</int>
+																				<int key="NSTextCheckingTypes">0</int>
+																				<nil key="NSMarkedAttributes"/>
+																				<reference key="NSBackgroundColor" ref="950289736"/>
+																				<dictionary key="NSSelectedAttributes">
+																					<object class="NSColor" key="NSBackgroundColor">
+																						<int key="NSColorSpace">6</int>
+																						<string key="NSCatalogName">System</string>
+																						<string key="NSColorName">selectedTextBackgroundColor</string>
+																						<reference key="NSColor" ref="142462500"/>
+																					</object>
+																					<object class="NSColor" key="NSColor">
+																						<int key="NSColorSpace">6</int>
+																						<string key="NSCatalogName">System</string>
+																						<string key="NSColorName">selectedTextColor</string>
+																						<reference key="NSColor" ref="560355442"/>
+																					</object>
+																				</dictionary>
+																				<reference key="NSInsertionColor" ref="560355442"/>
+																				<dictionary key="NSLinkAttributes">
+																					<object class="NSColor" key="NSColor">
+																						<int key="NSColorSpace">1</int>
+																						<bytes key="NSRGB">MCAwIDEAA</bytes>
+																					</object>
+																					<object class="NSCursor" key="NSCursor">
+																						<string key="NSHotSpot">{8, -8}</string>
+																						<int key="NSCursorType">13</int>
+																					</object>
+																					<integer value="1" key="NSUnderline"/>
+																				</dictionary>
+																				<nil key="NSDefaultParagraphStyle"/>
+																				<object class="NSTextFinder" key="NSTextFinder">
+																					<reference key="NSTextFinderClient" ref="798371442"/>
+																					<reference key="NSFindBarContainer" ref="648985862"/>
+																					<int key="NSTextFinderStyle">2</int>
+																					<bool key="NSIncrementalSearchingEnabled">YES</bool>
+																					<bool key="NSIncrementalSearchingShouldDimContentView">YES</bool>
+																				</object>
+																				<int key="NSPreferredTextFinderStyle">2</int>
+																			</object>
+																			<int key="NSTVFlags">6</int>
+																			<string key="NSMaxSize">{592, 10000000}</string>
+																			<string key="NSMinize">{331, 62}</string>
+																			<nil key="NSDelegate"/>
+																			<array key="NSAllowedInputLocales">
+																				<string>br</string>
+																				<string>mr</string>
+																				<string>bs</string>
+																				<string>ksf</string>
+																				<string>ee_TG</string>
+																				<string>ms</string>
+																				<string>kam_KE</string>
+																				<string>mt</string>
+																				<string>ha</string>
+																				<string>es_HN</string>
+																				<string>en_BM</string>
+																				<string>ml_IN</string>
+																				<string>ro_MD</string>
+																				<string>kab_DZ</string>
+																				<string>he</string>
+																				<string>es_CO</string>
+																				<string>my</string>
+																				<string>bas</string>
+																				<string>vai_Latn_LR</string>
+																				<string>es_PA</string>
+																				<string>az_Latn</string>
+																				<string>mer</string>
+																				<string>en_NZ</string>
+																				<string>xog_UG</string>
+																				<string>sg</string>
+																				<string>fr_GP</string>
+																				<string>sr_Cyrl_BA</string>
+																				<string>hi</string>
+																				<string>fil_PH</string>
+																				<string>lt_LT</string>
+																				<string>si</string>
+																				<string>mgh_MZ</string>
+																				<string>en_MT</string>
+																				<string>mfe</string>
+																				<string>luo_KE</string>
+																				<string>it_CH</string>
+																				<string>si_LK</string>
+																				<string>sk</string>
+																				<string>teo</string>
+																				<string>uz_Cyrl_UZ</string>
+																				<string>sl</string>
+																				<string>rm_CH</string>
+																				<string>az_Cyrl_AZ</string>
+																				<string>fr_GQ</string>
+																				<string>kde</string>
+																				<string>sn</string>
+																				<string>cgg_UG</string>
+																				<string>mas_TZ</string>
+																				<string>fr_RW</string>
+																				<string>es_SV</string>
+																				<string>so</string>
+																				<string>swc_CD</string>
+																				<string>en_MU</string>
+																				<string>sq</string>
+																				<string>hr</string>
+																				<string>yav_CM</string>
+																				<string>br_FR</string>
+																				<string>sr</string>
+																				<string>en_PH</string>
+																				<string>ca</string>
+																				<string>hu</string>
+																				<string>mk_MK</string>
+																				<string>fr_TD</string>
+																				<string>nb</string>
+																				<string>sv</string>
+																				<string>kln_KE</string>
+																				<string>sw</string>
+																				<string>nd</string>
+																				<string>el_GR</string>
+																				<string>fo_FO</string>
+																				<string>hy</string>
+																				<string>ne</string>
+																				<string>el_CY</string>
+																				<string>es_CR</string>
+																				<string>sr_Latn</string>
+																				<string>pa_Arab_PK</string>
+																				<string>ar_YE</string>
+																				<string>seh</string>
+																				<string>ja_JP</string>
+																				<string>ur_PK</string>
+																				<string>pa_Guru</string>
+																				<string>nl_SX</string>
+																				<string>gl_ES</string>
+																				<string>zh_Hant_HK</string>
+																				<string>ar_EG</string>
+																				<string>nl</string>
+																				<string>th_TH</string>
+																				<string>es_PE</string>
+																				<string>fr_KM</string>
+																				<string>ln_CD</string>
+																				<string>nn</string>
+																				<string>dua</string>
+																				<string>kk_Cyrl_KZ</string>
+																				<string>kea</string>
+																				<string>lv_LV</string>
+																				<string>kln</string>
+																				<string>tzm_Latn</string>
+																				<string>yo</string>
+																				<string>gsw_CH</string>
+																				<string>ha_Latn_GH</string>
+																				<string>is_IS</string>
+																				<string>pt_BR</string>
+																				<string>dua_CM</string>
+																				<string>cs</string>
+																				<string>en_PK</string>
+																				<string>fa_IR</string>
+																				<string>zh_Hans_SG</string>
+																				<string>luo</string>
+																				<string>ta</string>
+																				<string>fr_TG</string>
+																				<string>kde_TZ</string>
+																				<string>mr_IN</string>
+																				<string>ar_SA</string>
+																				<string>ka_GE</string>
+																				<string>mfe_MU</string>
+																				<string>id</string>
+																				<string>fr_LU</string>
+																				<string>de_LU</string>
+																				<string>ru_MD</string>
+																				<string>cy</string>
+																				<string>mgh</string>
+																				<string>zh_Hans_HK</string>
+																				<string>te</string>
+																				<string>bg_BG</string>
+																				<string>shi_Latn</string>
+																				<string>ig</string>
+																				<string>vai</string>
+																				<string>ses</string>
+																				<string>ii</string>
+																				<string>es_BO</string>
+																				<string>th</string>
+																				<string>ko_KR</string>
+																				<string>ti</string>
+																				<string>it_IT</string>
+																				<string>shi_Latn_MA</string>
+																				<string>pt_MZ</string>
+																				<string>ff_SN</string>
+																				<string>brx</string>
+																				<string>haw</string>
+																				<string>ln_CG</string>
+																				<string>zh_Hans</string>
+																				<string>so_KE</string>
+																				<string>bn_IN</string>
+																				<string>en_UM</string>
+																				<string>to</string>
+																				<string>id_ID</string>
+																				<string>agq_CM</string>
+																				<string>uz_Cyrl</string>
+																				<string>en_GU</string>
+																				<string>es_EC</string>
+																				<string>en_US_POSIX</string>
+																				<string>is</string>
+																				<string>sr_Latn_BA</string>
+																				<string>luy</string>
+																				<string>tr</string>
+																				<string>en_NA</string>
+																				<string>it</string>
+																				<string>pt_AO</string>
+																				<string>da</string>
+																				<string>nl_CW</string>
+																				<string>bo_IN</string>
+																				<string>vun_TZ</string>
+																				<string>ar_SD</string>
+																				<string>uz_Latn_UZ</string>
+																				<string>az_Latn_AZ</string>
+																				<string>de</string>
+																				<string>es_GQ</string>
+																				<string>fr_FR</string>
+																				<string>de_DE</string>
+																				<string>ta_IN</string>
+																				<string>rof_TZ</string>
+																				<string>nmg_CM</string>
+																				<string>ar_LY</string>
+																				<string>en_BW</string>
+																				<string>asa</string>
+																				<string>zh</string>
+																				<string>ewo_CM</string>
+																				<string>rn_BI</string>
+																				<string>fr_NE</string>
+																				<string>nus_SD</string>
+																				<string>es_MX</string>
+																				<string>mua_CM</string>
+																				<string>bem_ZM</string>
+																				<string>ha_Latn</string>
+																				<string>zh_Hans_CN</string>
+																				<string>bn_BD</string>
+																				<string>pt_GW</string>
+																				<string>om</string>
+																				<string>jmc</string>
+																				<string>de_AT</string>
+																				<string>kk_Cyrl</string>
+																				<string>sw_TZ</string>
+																				<string>ar_OM</string>
+																				<string>et_EE</string>
+																				<string>or</string>
+																				<string>da_DK</string>
+																				<string>ro_RO</string>
+																				<string>zh_Hant</string>
+																				<string>bm_ML</string>
+																				<string>ja</string>
+																				<string>lu_CD</string>
+																				<string>twq</string>
+																				<string>fr_CA</string>
+																				<string>naq</string>
+																				<string>zu</string>
+																				<string>en_IE</string>
+																				<string>ar_MA</string>
+																				<string>es_GT</string>
+																				<string>en_GY</string>
+																				<string>uz_Arab_AF</string>
+																				<string>en_AS</string>
+																				<string>bs_BA</string>
+																				<string>am_ET</string>
+																				<string>ar_TN</string>
+																				<string>swc</string>
+																				<string>ewo</string>
+																				<string>haw_US</string>
+																				<string>ar_JO</string>
+																				<string>fa_AF</string>
+																				<string>uz_Latn</string>
+																				<string>en_BZ</string>
+																				<string>nyn_UG</string>
+																				<string>ebu_KE</string>
+																				<string>te_IN</string>
+																				<string>cy_GB</string>
+																				<string>uk</string>
+																				<string>nyn</string>
+																				<string>en_JM</string>
+																				<string>dyo_SN</string>
+																				<string>en_US</string>
+																				<string>fil</string>
+																				<string>ar_KW</string>
+																				<string>af_ZA</string>
+																				<string>en_CA</string>
+																				<string>fr_DJ</string>
+																				<string>ti_ER</string>
+																				<string>ig_NG</string>
+																				<string>en_AU</string>
+																				<string>ur</string>
+																				<string>fr_MC</string>
+																				<string>pt_PT</string>
+																				<string>pa</string>
+																				<string>es_419</string>
+																				<string>fr_CD</string>
+																				<string>en_SG</string>
+																				<string>bo_CN</string>
+																				<string>kn_IN</string>
+																				<string>sr_Cyrl_RS</string>
+																				<string>lg_UG</string>
+																				<string>gu_IN</string>
+																				<string>ee</string>
+																				<string>nd_ZW</string>
+																				<string>bem</string>
+																				<string>uz</string>
+																				<string>sw_KE</string>
+																				<string>sq_AL</string>
+																				<string>hr_HR</string>
+																				<string>mas_KE</string>
+																				<string>el</string>
+																				<string>ti_ET</string>
+																				<string>es_AR</string>
+																				<string>pl</string>
+																				<string>en</string>
+																				<string>eo</string>
+																				<string>shi</string>
+																				<string>kok</string>
+																				<string>fr_CF</string>
+																				<string>fr_RE</string>
+																				<string>mas</string>
+																				<string>rof</string>
+																				<string>ru_UA</string>
+																				<string>yo_NG</string>
+																				<string>dav_KE</string>
+																				<string>ksb_TZ</string>
+																				<string>gv_GB</string>
+																				<string>pa_Arab</string>
+																				<string>es</string>
+																				<string>teo_UG</string>
+																				<string>ps</string>
+																				<string>es_PR</string>
+																				<string>fr_MF</string>
+																				<string>et</string>
+																				<string>vai_Vaii_LR</string>
+																				<string>pt</string>
+																				<string>eu</string>
+																				<string>ka</string>
+																				<string>rwk_TZ</string>
+																				<string>nb_NO</string>
+																				<string>fr_CG</string>
+																				<string>cgg</string>
+																				<string>zh_Hant_TW</string>
+																				<string>ses_ML</string>
+																				<string>lag</string>
+																				<string>sr_Cyrl_ME</string>
+																				<string>brx_IN</string>
+																				<string>en_ZW</string>
+																				<string>ak_GH</string>
+																				<string>vi_VN</string>
+																				<string>sv_FI</string>
+																				<string>to_TO</string>
+																				<string>fr_MG</string>
+																				<string>fr_GA</string>
+																				<string>fr_CH</string>
+																				<string>de_CH</string>
+																				<string>es_US</string>
+																				<string>ki</string>
+																				<string>my_MM</string>
+																				<string>twq_NE</string>
+																				<string>vi</string>
+																				<string>ar_QA</string>
+																				<string>ga_IE</string>
+																				<string>rwk</string>
+																				<string>bez</string>
+																				<string>ee_GH</string>
+																				<string>fr_YT</string>
+																				<string>kk</string>
+																				<string>as_IN</string>
+																				<string>ca_ES</string>
+																				<string>kl</string>
+																				<string>fr_SN</string>
+																				<string>ne_IN</string>
+																				<string>km</string>
+																				<string>ms_BN</string>
+																				<string>ar_LB</string>
+																				<string>kn</string>
+																				<string>ta_LK</string>
+																				<string>ur_IN</string>
+																				<string>fr_CI</string>
+																				<string>ko</string>
+																				<string>ha_Latn_NG</string>
+																				<string>sg_CF</string>
+																				<string>om_ET</string>
+																				<string>zh_Hant_MO</string>
+																				<string>uk_UA</string>
+																				<string>fa</string>
+																				<string>mt_MT</string>
+																				<string>ki_KE</string>
+																				<string>luy_KE</string>
+																				<string>kw</string>
+																				<string>pa_Guru_IN</string>
+																				<string>en_IN</string>
+																				<string>kab</string>
+																				<string>ar_IQ</string>
+																				<string>vai_Vaii</string>
+																				<string>ff</string>
+																				<string>en_TT</string>
+																				<string>bez_TZ</string>
+																				<string>es_NI</string>
+																				<string>ar_001</string>
+																				<string>nl_AW</string>
+																				<string>uz_Arab</string>
+																				<string>ne_NP</string>
+																				<string>fi</string>
+																				<string>en_BB</string>
+																				<string>khq</string>
+																				<string>gsw</string>
+																				<string>zh_Hans_MO</string>
+																				<string>en_MH</string>
+																				<string>hu_HU</string>
+																				<string>en_GB</string>
+																				<string>fr_BE</string>
+																				<string>de_BE</string>
+																				<string>sbp_TZ</string>
+																				<string>saq</string>
+																				<string>be_BY</string>
+																				<string>sl_SI</string>
+																				<string>sr_Latn_RS</string>
+																				<string>fo</string>
+																				<string>fr</string>
+																				<string>xog</string>
+																				<string>fr_BF</string>
+																				<string>tzm</string>
+																				<string>sk_SK</string>
+																				<string>fr_ML</string>
+																				<string>he_IL</string>
+																				<string>ha_Latn_NE</string>
+																				<string>ru_RU</string>
+																				<string>fr_GF</string>
+																				<string>fr_CM</string>
+																				<string>ksf_CM</string>
+																				<string>teo_KE</string>
+																				<string>seh_MZ</string>
+																				<string>kl_GL</string>
+																				<string>bas_CM</string>
+																				<string>fi_FI</string>
+																				<string>kam</string>
+																				<string>es_ES</string>
+																				<string>af</string>
+																				<string>asa_TZ</string>
+																				<string>cs_CZ</string>
+																				<string>tr_TR</string>
+																				<string>es_PY</string>
+																				<string>tzm_Latn_MA</string>
+																				<string>lg</string>
+																				<string>ebu</string>
+																				<string>en_HK</string>
+																				<string>nl_NL</string>
+																				<string>en_BE</string>
+																				<string>ms_MY</string>
+																				<string>es_UY</string>
+																				<string>ar_BH</string>
+																				<string>kw_GB</string>
+																				<string>ak</string>
+																				<string>chr</string>
+																				<string>dav</string>
+																				<string>lag_TZ</string>
+																				<string>am</string>
+																				<string>so_DJ</string>
+																				<string>shi_Tfng_MA</string>
+																				<string>dje</string>
+																				<string>dyo</string>
+																				<string>ln</string>
+																				<string>sr_Latn_ME</string>
+																				<string>sn_ZW</string>
+																				<string>or_IN</string>
+																				<string>ar</string>
+																				<string>as</string>
+																				<string>fr_BI</string>
+																				<string>jmc_TZ</string>
+																				<string>chr_US</string>
+																				<string>sbp</string>
+																				<string>eu_ES</string>
+																				<string>saq_KE</string>
+																				<string>vun</string>
+																				<string>lt</string>
+																				<string>naq_NA</string>
+																				<string>ga</string>
+																				<string>af_NA</string>
+																				<string>lu</string>
+																				<string>nmg</string>
+																				<string>kea_CV</string>
+																				<string>es_DO</string>
+																				<string>lv</string>
+																				<string>kok_IN</string>
+																				<string>de_LI</string>
+																				<string>fr_BJ</string>
+																				<string>az</string>
+																				<string>guz_KE</string>
+																				<string>rw_RW</string>
+																				<string>mg_MG</string>
+																				<string>km_KH</string>
+																				<string>pt_ST</string>
+																				<string>vai_Latn</string>
+																				<string>gl</string>
+																				<string>ar_AE</string>
+																				<string>shi_Tfng</string>
+																				<string>fr_MQ</string>
+																				<string>rm</string>
+																				<string>sv_SE</string>
+																				<string>rn</string>
+																				<string>az_Cyrl</string>
+																				<string>ro</string>
+																				<string>so_ET</string>
+																				<string>en_ZA</string>
+																				<string>ii_CN</string>
+																				<string>fr_BL</string>
+																				<string>hi_IN</string>
+																				<string>agq</string>
+																				<string>gu</string>
+																				<string>mer_KE</string>
+																				<string>nn_NO</string>
+																				<string>gv</string>
+																				<string>ru</string>
+																				<string>yav</string>
+																				<string>ar_DZ</string>
+																				<string>ar_SY</string>
+																				<string>en_MP</string>
+																				<string>nl_BE</string>
+																				<string>rw</string>
+																				<string>be</string>
+																				<string>dje_NE</string>
+																				<string>en_VI</string>
+																				<string>es_CL</string>
+																				<string>mua</string>
+																				<string>bg</string>
+																				<string>mg</string>
+																				<string>hy_AM</string>
+																				<string>nus</string>
+																				<string>zu_ZA</string>
+																				<string>guz</string>
+																				<string>ksb</string>
+																				<string>mk</string>
+																				<string>es_VE</string>
+																				<string>ml</string>
+																				<string>bm</string>
+																				<string>khq_ML</string>
+																				<string>bn</string>
+																				<string>ps_AF</string>
+																				<string>so_SO</string>
+																				<string>sr_Cyrl</string>
+																				<string>pl_PL</string>
+																				<string>fr_GN</string>
+																				<string>bo</string>
+																				<string>om_KE</string>
+																			</array>
+																		</object>
+																	</array>
+																	<string key="NSFrame">{{1, 1}, {331, 62}}</string>
+																	<reference key="NSSuperview" ref="648985862"/>
+																	<reference key="NSWindow"/>
+																	<reference key="NSNextKeyView" ref="798371442"/>
+																	<string key="NSReuseIdentifierKey">_NS:11</string>
+																	<reference key="NSDocView" ref="798371442"/>
+																	<reference key="NSBGColor" ref="950289736"/>
+																	<object class="NSCursor" key="NSCursor">
+																		<string key="NSHotSpot">{4, 5}</string>
+																		<object class="NSImage" key="NSImage">
+																			<int key="NSImageFlags">79691776</int>
+																			<array key="NSReps">
+																				<array>
+																					<integer value="5"/>
+																					<object class="NSURL">
+																						<nil key="NS.base"/>
+																						<string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string>
+																					</object>
+																				</array>
+																			</array>
+																			<object class="NSColor" key="NSColor">
+																				<int key="NSColorSpace">3</int>
+																				<bytes key="NSWhite">MCAwAA</bytes>
+																			</object>
+																		</object>
+																	</object>
+																	<int key="NScvFlags">4</int>
+																</object>
+																<object class="NSScroller" id="668517472">
+																	<reference key="NSNextResponder" ref="648985862"/>
+																	<int key="NSvFlags">256</int>
+																	<string key="NSFrame">{{316, 1}, {16, 62}}</string>
+																	<reference key="NSSuperview" ref="648985862"/>
+																	<reference key="NSWindow"/>
+																	<reference key="NSNextKeyView" ref="837479634"/>
+																	<string key="NSReuseIdentifierKey">_NS:83</string>
+																	<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																	<reference key="NSTarget" ref="648985862"/>
+																	<string key="NSAction">_doScroller:</string>
+																	<double key="NSPercent">0.9920948616600791</double>
+																</object>
+																<object class="NSScroller" id="4614194">
+																	<reference key="NSNextResponder" ref="648985862"/>
+																	<int key="NSvFlags">-2147483392</int>
+																	<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+																	<reference key="NSSuperview" ref="648985862"/>
+																	<reference key="NSWindow"/>
+																	<reference key="NSNextKeyView" ref="424519753"/>
+																	<string key="NSReuseIdentifierKey">_NS:33</string>
+																	<bool key="NSEnabled">YES</bool>
+																	<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																	<int key="NSsFlags">1</int>
+																	<reference key="NSTarget" ref="648985862"/>
+																	<string key="NSAction">_doScroller:</string>
+																	<double key="NSCurValue">1</double>
+																	<double key="NSPercent">0.94565218687057495</double>
+																</object>
+															</array>
+															<string key="NSFrame">{{18, 14}, {333, 64}}</string>
 															<reference key="NSSuperview" ref="283271893"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="837479634"/>
+															<reference key="NSNextKeyView" ref="4614194"/>
 															<string key="NSReuseIdentifierKey">_NS:9</string>
-															<string key="NSAntiCompressionPriority">{250, 750}</string>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="692717424">
-																<int key="NSCellFlags">-1805647871</int>
-																<int key="NSCellFlags2">272629760</int>
-																<string key="NSContents"/>
-																<reference key="NSSupport" ref="584556528"/>
-																<string key="NSCellIdentifier">_NS:9</string>
-																<reference key="NSControlView" ref="65853905"/>
-																<bool key="NSDrawsBackground">YES</bool>
-																<reference key="NSBackgroundColor" ref="563022002"/>
-																<reference key="NSTextColor" ref="619012"/>
-															</object>
-															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															<int key="NSsFlags">133266</int>
+															<reference key="NSVScroller" ref="668517472"/>
+															<reference key="NSHScroller" ref="4614194"/>
+															<reference key="NSContentView" ref="424519753"/>
+															<double key="NSMinMagnification">0.25</double>
+															<double key="NSMaxMagnification">4</double>
+															<double key="NSMagnification">1</double>
 														</object>
 													</array>
-													<string key="NSFrame">{{1, 1}, {440, 229}}</string>
+													<string key="NSFrame">{{1, 1}, {369, 88}}</string>
 													<reference key="NSSuperview" ref="583222117"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="65853905"/>
+													<reference key="NSNextKeyView" ref="648985862"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
 												</object>
 											</array>
-											<string key="NSFrame">{{6, 54}, {442, 245}}</string>
+											<string key="NSFrame">{{6, 54}, {371, 104}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="283271893"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<string key="NSHuggingPriority">{250, 250}</string>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
 												<int key="NSCellFlags">67108864</int>
@@ -674,9 +1321,10 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSButton" id="326757813">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{382, 10}, {69, 32}}</string>
+											<string key="NSFrame">{{311, 10}, {69, 32}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="1017592733">
@@ -698,7 +1346,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 										<object class="NSButton" id="837479634">
 											<reference key="NSNextResponder" ref="709543686"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{300, 10}, {82, 32}}</string>
+											<string key="NSFrame">{{229, 10}, {82, 32}}</string>
 											<reference key="NSSuperview" ref="709543686"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="326757813"/>
@@ -721,7 +1369,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrame">{{10, 33}, {462, 551}}</string>
+									<string key="NSFrame">{{10, 33}, {391, 415}}</string>
 									<reference key="NSSuperview" ref="621279799"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="277125192"/>
@@ -737,7 +1385,8 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews"/>
-									<string key="NSFrame">{{10, 33}, {462, 551}}</string>
+									<string key="NSFrame">{{10, 33}, {391, 415}}</string>
+									<reference key="NSNextKeyView"/>
 									<string key="NSReuseIdentifierKey">_NS:28</string>
 								</object>
 								<string key="NSLabel">Advanced</string>
@@ -755,38 +1404,12 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 						</array>
 					</object>
 				</array>
-				<string key="NSFrameSize">{508, 621}</string>
+				<string key="NSFrameSize">{437, 485}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="621279799"/>
 				<string key="NSClassName">NSView</string>
 			</object>
-			<object class="NSImageView" id="491721175">
-				<nil key="NSNextResponder"/>
-				<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="NSFrameSize">{54, 54}</string>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<bool key="NSEnabled">YES</bool>
-				<object class="NSImageCell" key="NSCell" id="26384283">
-					<int key="NSCellFlags">134217728</int>
-					<int key="NSCellFlags2">33554432</int>
-					<string key="NSCellIdentifier">_NS:9</string>
-					<int key="NSAlign">0</int>
-					<int key="NSScale">0</int>
-					<int key="NSStyle">2</int>
-					<bool key="NSAnimates">NO</bool>
-				</object>
-				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-				<bool key="NSEditable">YES</bool>
-			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -798,6 +1421,22 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 					</object>
 					<int key="connectionID">2</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">cancelButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="837479634"/>
+					</object>
+					<int key="connectionID">397</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">save:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="326757813"/>
+					</object>
+					<int key="connectionID">398</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1012,20 +1651,20 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="854200100">
+							<object class="IBNSLayoutConstraint" id="350187710">
 								<reference key="firstItem" ref="852804085"/>
-								<int key="firstAttribute">6</int>
+								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="583222117"/>
-								<int key="secondAttribute">6</int>
+								<reference key="secondItem" ref="854364879"/>
+								<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="709543686"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">2</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="274720122">
@@ -1044,37 +1683,21 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="205504001">
+							<object class="IBNSLayoutConstraint" id="149863206">
 								<reference key="firstItem" ref="316610385"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="852804085"/>
-								<int key="secondAttribute">3</int>
+								<reference key="secondItem" ref="96227468"/>
+								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
+									<double key="value">8</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="709543686"/>
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="517733370">
-								<reference key="firstItem" ref="316610385"/>
-								<int key="firstAttribute">11</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="854364879"/>
-								<int key="secondAttribute">11</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="709543686"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
+								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="956042763">
 								<reference key="firstItem" ref="316610385"/>
@@ -1124,6 +1747,54 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="854200100">
+								<reference key="firstItem" ref="583222117"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="852804085"/>
+								<int key="secondAttribute">6</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="709543686"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="32081980">
+								<reference key="firstItem" ref="583222117"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="852804085"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="709543686"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="895158305">
+								<reference key="firstItem" ref="583222117"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="709543686"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">9</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="709543686"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="652030276">
 								<reference key="firstItem" ref="96227468"/>
 								<int key="firstAttribute">3</int>
@@ -1156,37 +1827,21 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="588729379">
-								<reference key="firstItem" ref="583222117"/>
-								<int key="firstAttribute">3</int>
+							<object class="IBNSLayoutConstraint" id="57329926">
+								<reference key="firstItem" ref="854364879"/>
+								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="854364879"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="709543686"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="895158305">
-								<reference key="firstItem" ref="583222117"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="709543686"/>
-								<int key="secondAttribute">5</int>
+								<reference key="secondItem" ref="538156799"/>
+								<int key="secondAttribute">10</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">9</double>
+									<double key="value">0.0</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="709543686"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="401942116">
 								<reference key="firstItem" ref="838479747"/>
@@ -1492,38 +2147,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="973885221">
-								<reference key="firstItem" ref="849363736"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="709543686"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="709543686"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="293923221">
-								<reference key="firstItem" ref="849363736"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="650790040"/>
-								<int key="secondAttribute">5</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="709543686"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="229444790">
 								<reference key="firstItem" ref="364635018"/>
 								<int key="firstAttribute">5</int>
@@ -1572,6 +2195,38 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="973885221">
+								<reference key="firstItem" ref="849363736"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="709543686"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">3</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="709543686"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="293923221">
+								<reference key="firstItem" ref="849363736"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="650790040"/>
+								<int key="secondAttribute">5</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="709543686"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="1047731627">
 								<reference key="firstItem" ref="556375611"/>
 								<int key="firstAttribute">11</int>
@@ -1649,12 +2304,12 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 							<reference ref="538156799"/>
 							<reference ref="849363736"/>
 							<reference ref="277125192"/>
-							<reference ref="854364879"/>
-							<reference ref="316610385"/>
-							<reference ref="852804085"/>
 							<reference ref="583222117"/>
 							<reference ref="326757813"/>
 							<reference ref="837479634"/>
+							<reference ref="854364879"/>
+							<reference ref="316610385"/>
+							<reference ref="852804085"/>
 						</array>
 						<reference key="parent" ref="66471917"/>
 					</object>
@@ -2121,34 +2776,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 						<reference key="object" ref="956042763"/>
 						<reference key="parent" ref="709543686"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">267</int>
-						<reference key="object" ref="517733370"/>
-						<reference key="parent" ref="709543686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">269</int>
-						<reference key="object" ref="725464002"/>
-						<reference key="parent" ref="709543686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">270</int>
-						<reference key="object" ref="847458250"/>
-						<reference key="parent" ref="316610385"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">271</int>
-						<reference key="object" ref="491721175"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="26384283"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">272</int>
-						<reference key="object" ref="26384283"/>
-						<reference key="parent" ref="491721175"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">214</int>
 						<reference key="object" ref="1022146629"/>
@@ -2276,12 +2903,11 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 						<int key="objectID">312</int>
 						<reference key="object" ref="583222117"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="65853905"/>
 							<object class="IBNSLayoutConstraint" id="1052961252">
 								<reference key="firstItem" ref="583222117"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="65853905"/>
+								<reference key="secondItem" ref="648985862"/>
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -2297,7 +2923,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<reference key="firstItem" ref="583222117"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="65853905"/>
+								<reference key="secondItem" ref="648985862"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -2310,7 +2936,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="365565455">
-								<reference key="firstItem" ref="65853905"/>
+								<reference key="firstItem" ref="648985862"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="583222117"/>
@@ -2326,7 +2952,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="128347091">
-								<reference key="firstItem" ref="65853905"/>
+								<reference key="firstItem" ref="648985862"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="583222117"/>
@@ -2341,6 +2967,23 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="617066174">
+								<reference key="firstItem" ref="583222117"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">1</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">100</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="583222117"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">1</int>
+							</object>
+							<reference ref="648985862"/>
 						</array>
 						<reference key="parent" ref="709543686"/>
 					</object>
@@ -2354,55 +2997,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 						<reference key="object" ref="274720122"/>
 						<reference key="parent" ref="709543686"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">332</int>
-						<reference key="object" ref="65853905"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="692717424"/>
-							<object class="IBNSLayoutConstraint" id="6706731">
-								<reference key="firstItem" ref="65853905"/>
-								<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">205</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="65853905"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="583222117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">333</int>
-						<reference key="object" ref="692717424"/>
-						<reference key="parent" ref="65853905"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">334</int>
-						<reference key="object" ref="128347091"/>
-						<reference key="parent" ref="583222117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">335</int>
-						<reference key="object" ref="365565455"/>
-						<reference key="parent" ref="583222117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">339</int>
-						<reference key="object" ref="20915718"/>
-						<reference key="parent" ref="583222117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">344</int>
-						<reference key="object" ref="854200100"/>
-						<reference key="parent" ref="709543686"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">345</int>
 						<reference key="object" ref="326757813"/>
@@ -2449,30 +3043,95 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 						<reference key="object" ref="781980084"/>
 						<reference key="parent" ref="709543686"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">360</int>
-						<reference key="object" ref="205504001"/>
-						<reference key="parent" ref="709543686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">362</int>
-						<reference key="object" ref="588729379"/>
-						<reference key="parent" ref="709543686"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">363</int>
 						<reference key="object" ref="433700263"/>
 						<reference key="parent" ref="709543686"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">366</int>
+						<int key="objectID">368</int>
+						<reference key="object" ref="57329926"/>
+						<reference key="parent" ref="709543686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="149863206"/>
+						<reference key="parent" ref="709543686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="350187710"/>
+						<reference key="parent" ref="709543686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">374</int>
+						<reference key="object" ref="32081980"/>
+						<reference key="parent" ref="709543686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="854200100"/>
+						<reference key="parent" ref="709543686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">380</int>
+						<reference key="object" ref="648985862"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="798371442"/>
+							<reference ref="4614194"/>
+							<reference ref="668517472"/>
+						</array>
+						<reference key="parent" ref="583222117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">381</int>
+						<reference key="object" ref="798371442"/>
+						<reference key="parent" ref="648985862"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="4614194"/>
+						<reference key="parent" ref="648985862"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="668517472"/>
+						<reference key="parent" ref="648985862"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="128347091"/>
+						<reference key="parent" ref="583222117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">389</int>
+						<reference key="object" ref="365565455"/>
+						<reference key="parent" ref="583222117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">391</int>
+						<reference key="object" ref="20915718"/>
+						<reference key="parent" ref="583222117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">392</int>
 						<reference key="object" ref="1052961252"/>
 						<reference key="parent" ref="583222117"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">367</int>
-						<reference key="object" ref="6706731"/>
-						<reference key="parent" ref="65853905"/>
+						<int key="objectID">393</int>
+						<reference key="object" ref="617066174"/>
+						<reference key="parent" ref="583222117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">270</int>
+						<reference key="object" ref="847458250"/>
+						<reference key="parent" ref="316610385"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">269</int>
+						<reference key="object" ref="725464002"/>
+						<reference key="parent" ref="709543686"/>
 					</object>
 				</array>
 			</object>
@@ -2560,11 +3219,8 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 				<string key="262.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="263.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="265.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="267.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="286.IBNSViewMetadataConstraints">
 					<reference ref="733307922"/>
 				</array>
@@ -2594,6 +3250,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="312.IBNSViewMetadataConstraints">
+					<reference ref="617066174"/>
 					<reference ref="128347091"/>
 					<reference ref="365565455"/>
 					<reference ref="20915718"/>
@@ -2602,16 +3259,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 				<boolean value="NO" key="312.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="312.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="315.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="332.IBNSViewMetadataConstraints">
-					<reference ref="6706731"/>
-				</array>
-				<boolean value="NO" key="332.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="332.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="333.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="334.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="335.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="344.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="345.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="345.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2622,11 +3269,22 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="355.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="366.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="367.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="380.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2637,11 +3295,11 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 					<reference ref="965996470"/>
 					<reference ref="687971485"/>
 					<reference ref="1047731627"/>
+					<reference ref="293923221"/>
+					<reference ref="973885221"/>
 					<reference ref="811467438"/>
 					<reference ref="382465476"/>
 					<reference ref="229444790"/>
-					<reference ref="293923221"/>
-					<reference ref="973885221"/>
 					<reference ref="506987926"/>
 					<reference ref="379354152"/>
 					<reference ref="149451350"/>
@@ -2661,17 +3319,18 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 					<reference ref="725464002"/>
 					<reference ref="90846333"/>
 					<reference ref="401942116"/>
-					<reference ref="895158305"/>
-					<reference ref="588729379"/>
+					<reference ref="57329926"/>
 					<reference ref="1022146629"/>
 					<reference ref="652030276"/>
+					<reference ref="895158305"/>
+					<reference ref="32081980"/>
+					<reference ref="854200100"/>
 					<reference ref="692704946"/>
 					<reference ref="725856007"/>
 					<reference ref="956042763"/>
-					<reference ref="517733370"/>
-					<reference ref="205504001"/>
+					<reference ref="149863206"/>
 					<reference ref="274720122"/>
-					<reference ref="854200100"/>
+					<reference ref="350187710"/>
 					<reference ref="70997008"/>
 					<reference ref="433700263"/>
 					<reference ref="323873071"/>
@@ -2703,13 +3362,35 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">367</int>
+			<int key="maxID">398</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">MPEntryEditController</string>
 					<string key="superclassName">MPViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">save:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">save:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">save:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">cancelButton</string>
+						<string key="NS.object.0">NSButton</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">cancelButton</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">cancelButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/MPEntryEditController.h</string>
diff --git a/MacPass/FilterBar.xib b/MacPass/FilterBar.xib
index 7ff277c2..60a4d692 100644
--- a/MacPass/FilterBar.xib
+++ b/MacPass/FilterBar.xib
@@ -37,7 +37,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="1005">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSButton" id="113591000">
@@ -45,7 +45,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{496, 5}, {42, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="791616402">
@@ -73,7 +72,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{188, 5}, {38, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="113591000"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -102,7 +100,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{104, 5}, {76, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="340435610"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -127,7 +124,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{5, 6}, {44, 14}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="7073340"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -168,7 +164,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{54, 4}, {42, 19}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="902262560"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -190,8 +185,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{546, 28}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="906526407"/>
 				<string key="NSClassName">MPGradientView</string>
 			</object>
@@ -206,30 +199,6 @@
 					</object>
 					<int key="connectionID">48</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFilterSpace:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="7073340"/>
-					</object>
-					<int key="connectionID">49</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFilterSpace:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="902262560"/>
-					</object>
-					<int key="connectionID">50</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFilterSpace:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="340435610"/>
-					</object>
-					<int key="connectionID">51</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">filterTitleButton</string>
@@ -278,6 +247,30 @@
 					</object>
 					<int key="connectionID">76</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">_toggleFilterSpace:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="902262560"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">_toggleFilterSpace:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="340435610"/>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">_toggleFilterSpace:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="7073340"/>
+					</object>
+					<int key="connectionID">79</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -710,7 +703,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">76</int>
+			<int key="maxID">79</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/MacPass/MPDatabaseController.h b/MacPass/MPDatabaseController.h
index 71f04546..21bf3e83 100644
--- a/MacPass/MPDatabaseController.h
+++ b/MacPass/MPDatabaseController.h
@@ -28,6 +28,7 @@ APPKIT_EXTERN NSString *const MPDatabaseControllerDatabaseKey;
 @property (retain, readonly, nonatomic) MPDatabaseDocument *database;
 
 + (MPDatabaseController *)defaultController;
++ (BOOL)hasOpenDatabase;
 
 //- (MPDatabaseDocument *)createDatabase:(MPDatabaseVersion )version password:(NSString *)password keyfile:(NSURL *)key;
 - (MPDatabaseDocument *)openDatabase:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key;
diff --git a/MacPass/MPDatabaseController.m b/MacPass/MPDatabaseController.m
index 84a7f9cc..88f12c6a 100644
--- a/MacPass/MPDatabaseController.m
+++ b/MacPass/MPDatabaseController.m
@@ -31,6 +31,10 @@ NSString *const MPDatabaseControllerDatabaseKey = @"MPDatabaseControllerDatabase
   return sharedInstance;
 }
 
++ (BOOL)hasOpenDatabase {
+  return (nil != [MPDatabaseController defaultController].database);
+}
+
 - (id)init
 {
   self = [super init];
diff --git a/MacPass/MPEntryEditController.h b/MacPass/MPEntryEditController.h
index 32f88667..e44d88de 100644
--- a/MacPass/MPEntryEditController.h
+++ b/MacPass/MPEntryEditController.h
@@ -7,7 +7,12 @@
 //
 
 #import "MPViewController.h"
+@class KdbNode;
 
 @interface MPEntryEditController : MPViewController
 
+@property (retain) id selectedItem;
+
+- (IBAction)save:(id)sender;
+
 @end
diff --git a/MacPass/MPEntryEditController.m b/MacPass/MPEntryEditController.m
index 71e9dd18..176484ba 100644
--- a/MacPass/MPEntryEditController.m
+++ b/MacPass/MPEntryEditController.m
@@ -7,21 +7,42 @@
 //
 
 #import "MPEntryEditController.h"
+#import "MPMainWindowController.h"
 
 @interface MPEntryEditController ()
 
+@property (assign) IBOutlet NSButton *cancelButton;
+
 @end
 
 @implementation MPEntryEditController
 
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
+- (id)init {
+  return [self initWithNibName:@"EntryEditView" bundle:nil];
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
         // Initialization code here.
     }
-    
     return self;
 }
 
+- (void)dealloc {
+  self.selectedItem = nil;
+  [super dealloc];
+}
+
+- (NSResponder *)reconmendedFirstResponder {
+  return self.cancelButton;
+}
+
+#pragma mark Actions
+
+- (IBAction)save:(id)sender {
+  MPMainWindowController *controller = [[self.view window] windowController];
+  [controller showEntries];
+}
+
 @end
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 463201dc..9d08d732 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -59,19 +59,19 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 @property (assign, nonatomic) MPFilterModeType filterMode;
 @property (retain, nonatomic) NSDictionary *filterButtonToMode;
 
-- (IBAction)toggleFilterSpace:(id)sender;
+- (IBAction)_toggleFilterSpace:(id)sender;
 
-- (BOOL)shouldFilterURLs;
-- (BOOL)shouldFilterTitles;
-- (BOOL)shouldFilterUsernames;
+- (BOOL)_shouldFilterURLs;
+- (BOOL)_shouldFilterTitles;
+- (BOOL)_shouldFilterUsernames;
 
 - (BOOL)hasFilter;
 - (void)updateFilter;
 - (void)setupFilterBar;
 - (void)setupPathBar;
-- (void)didChangeGroupSelectionInOutlineView:(NSNotification *)notification;
-- (void)showFilterBarAnimated:(BOOL)animate;
-- (void)hideStatusBarAnimated:(BOOL)animate;
+- (void)_didChangeGroupSelectionInOutlineView:(NSNotification *)notification;
+- (void)_showFilterBarAnimated:(BOOL)animate;
+- (void)_hideStatusBarAnimated:(BOOL)animate;
 
 @end
 
@@ -93,7 +93,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
                            } retain];
     _entryArrayController = [[NSArrayController alloc] init];
     [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(didChangeGroupSelectionInOutlineView:)
+                                             selector:@selector(_didChangeGroupSelectionInOutlineView:)
                                                  name:MPOutlineViewDidChangeGroupSelection
                                                object:nil];
   }
@@ -111,7 +111,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
 - (void)didLoadView {
   [self.view setWantsLayer:YES];
-  [self hideStatusBarAnimated:NO];
+  [self _hideStatusBarAnimated:NO];
   
   [self.entryTable setDelegate:self];
   
@@ -179,7 +179,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 }
 
 #pragma mark Notifications
-- (void)didChangeGroupSelectionInOutlineView:(NSNotification *)notification {
+- (void)_didChangeGroupSelectionInOutlineView:(NSNotification *)notification {
   
   if([self hasFilter]) {
     return;
@@ -216,25 +216,25 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 - (void)clearFilter {
   self.filter = nil;
   [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
-  [self hideStatusBarAnimated:YES];
+  [self _hideStatusBarAnimated:YES];
 }
 
 - (void)updateFilter {
   MPDatabaseDocument *openDatabase = [MPDatabaseController defaultController].database;
   if(openDatabase) {
-    [self showFilterBarAnimated:YES];
+    [self _showFilterBarAnimated:YES];
     
     dispatch_queue_t backgroundQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
     dispatch_async(backgroundQueue, ^{
       
       NSMutableArray *prediactes = [NSMutableArray arrayWithCapacity:3];
-      if( [self shouldFilterTitles] ) {
+      if( [self _shouldFilterTitles] ) {
         [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", self.filter]];
       }
-      if( [self shouldFilterUsernames] ) {
+      if( [self _shouldFilterUsernames] ) {
         [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.username CONTAINS[cd] %@", self.filter]];
       }
-      if( [self shouldFilterURLs] ) {
+      if( [self _shouldFilterURLs] ) {
         [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.url CONTAINS[cd] %@", self.filter]];
       }
       NSPredicate *fullFilter = [NSCompoundPredicate orPredicateWithSubpredicates:prediactes];
@@ -275,7 +275,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
 #pragma mark Animation
 
-- (void)showFilterBarAnimated:(BOOL)animate {
+- (void)_showFilterBarAnimated:(BOOL)animate {
   
   animate = NO;
   
@@ -285,9 +285,9 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   /*
    Make sure the buttons are set correctyl every time
    */
-  [self.filterTitleButton setState:[self shouldFilterTitles] ? NSOnState : NSOffState];
-  [self.filterURLButton setState:[self shouldFilterURLs] ? NSOnState : NSOffState ];
-  [self.filterUsernameButton setState:[self shouldFilterUsernames] ? NSOnState : NSOffState];
+  [self.filterTitleButton setState:[self _shouldFilterTitles] ? NSOnState : NSOffState];
+  [self.filterURLButton setState:[self _shouldFilterURLs] ? NSOnState : NSOffState ];
+  [self.filterUsernameButton setState:[self _shouldFilterUsernames] ? NSOnState : NSOffState];
   
   if(self.isStatusBarVisible) {
     return; // nothign to to
@@ -315,7 +315,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   }
 }
 
-- (void)hideStatusBarAnimated:(BOOL)animate {
+- (void)_hideStatusBarAnimated:(BOOL)animate {
   
   
   animate = NO;
@@ -342,7 +342,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
 #pragma mark Actions
 
-- (void)toggleFilterSpace:(id)sender {
+- (void)_toggleFilterSpace:(id)sender {
   NSButton *button = sender;
   NSNumber *value = self.filterButtonToMode[[button identifier]];
   MPFilterModeType toggledMode = (MPFilterModeType)[value intValue];
@@ -371,15 +371,15 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   }
 }
 
-- (BOOL)shouldFilterTitles {
+- (BOOL)_shouldFilterTitles {
   return ( MPFilterNone != (self.filterMode & MPFilterTitles));
 }
 
-- (BOOL)shouldFilterURLs {
+- (BOOL)_shouldFilterURLs {
   return ( MPFilterNone != (self.filterMode & MPFilterUrls));
 }
 
-- (BOOL)shouldFilterUsernames {
+- (BOOL)_shouldFilterUsernames {
   return ( MPFilterNone != (self.filterMode & MPFilterUsernames));
 }
 
diff --git a/MacPass/MPGradientView.m b/MacPass/MPGradientView.m
index d0167dbf..03a35098 100644
--- a/MacPass/MPGradientView.m
+++ b/MacPass/MPGradientView.m
@@ -14,7 +14,7 @@
 @property (retain) NSGradient *activeGradient;
 @property (retain) NSGradient *inactiveGradient;
 
-- (void)refreshActiveState;
+- (void)_refreshActiveState;
 
 @end
 
@@ -66,8 +66,8 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResignKeyNotification object:[self window]];
   }
   if(newWindow) {
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshActiveState) name:NSWindowDidBecomeKeyNotification object:newWindow];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshActiveState) name:NSWindowDidResignKeyNotification object:newWindow];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_refreshActiveState) name:NSWindowDidBecomeKeyNotification object:newWindow];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_refreshActiveState) name:NSWindowDidResignKeyNotification object:newWindow];
   }
 }
 
@@ -76,7 +76,7 @@
   [super viewWillMoveToWindow:newWindow];
 }
 
-- (void)refreshActiveState {
+- (void)_refreshActiveState {
   self.isRenderedActive = [[self window] isKeyWindow];
 }
 
diff --git a/MacPass/MPLoggerProxy.h b/MacPass/MPLoggerProxy.h
new file mode 100644
index 00000000..e24ebc1d
--- /dev/null
+++ b/MacPass/MPLoggerProxy.h
@@ -0,0 +1,16 @@
+//
+//  MPLoggerProxy.h
+//  MacPass
+//
+//  Created by michael starke on 26.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface MPLoggerProxy : NSObject
+@property (retain) id original;
+
+- (id)initWithOriginal:(id) value;
+
+@end
diff --git a/MacPass/MPLoggerProxy.m b/MacPass/MPLoggerProxy.m
new file mode 100644
index 00000000..eabc4622
--- /dev/null
+++ b/MacPass/MPLoggerProxy.m
@@ -0,0 +1,35 @@
+//
+//  MPLoggerProxy.m
+//  MacPass
+//
+//  Created by michael starke on 26.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPLoggerProxy.h"
+
+@implementation MPLoggerProxy
+
+- (id) initWithOriginal:(id)value {
+  if (self = [super init]) {
+    self.original = value;
+  }
+  return self;
+}
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)sel {
+  NSMethodSignature *sig = [super methodSignatureForSelector:sel];
+  if(!sig)
+  {
+    sig = [self.original methodSignatureForSelector:sel];
+  }
+  return sig;
+}
+
+- (void)forwardInvocation:(NSInvocation *)inv {
+  NSLog(@"[%@ %@] %@ %@", self.original, inv,[inv methodSignature],
+        NSStringFromSelector([inv selector]));
+  [inv invokeWithTarget:self.original];
+}
+
+@end
diff --git a/MacPass/MPMainWindowController.h b/MacPass/MPMainWindowController.h
index 46e7f7d6..5f88ee57 100644
--- a/MacPass/MPMainWindowController.h
+++ b/MacPass/MPMainWindowController.h
@@ -17,10 +17,4 @@
 - (void)performFindPanelAction:(id)sender;
 - (void)clearOutlineSelection:(id)sender;
 
-/*
- Sets the content View controller
- @param viewController - use nil to reset to welcome screen
- */
-- (void)setContentViewController:(MPViewController *)viewController;
-
 @end
diff --git a/MacPass/MPMainWindowController.m b/MacPass/MPMainWindowController.m
index a175c622..c9e9233c 100644
--- a/MacPass/MPMainWindowController.m
+++ b/MacPass/MPMainWindowController.m
@@ -13,6 +13,7 @@
 #import "MPToolbarDelegate.h"
 #import "MPOutlineViewController.h"
 #import "MPMainWindowSplitViewDelegate.h"
+#import "MPEntryEditController.h"
 
 @interface MPMainWindowController ()
 
@@ -26,13 +27,15 @@
 
 @property (retain) MPPasswordInputController *passwordInputController;
 @property (retain) MPEntryViewController *entryViewController;
+@property (retain) MPEntryEditController *entryEditController;
 @property (retain) MPOutlineViewController *outlineViewController;
 
 @property (retain) MPToolbarDelegate *toolbarDelegate;
 @property (retain) MPMainWindowSplitViewDelegate *splitViewDelegate;
 
-- (void)collapseOutlineView;
-- (void)expandOutlineView;
+- (void)_collapseOutlineView;
+- (void)_expandOutlineView;
+- (void)_setContentViewController:(MPViewController *)viewController;
 
 @end
 
@@ -64,6 +67,7 @@
   
   self.passwordInputController = nil;
   self.entryViewController = nil;
+  self.entryEditController = nil;
   self.outlineViewController = nil;
   
   self.toolbarDelegate = nil;
@@ -95,11 +99,11 @@
   [self.splitView replaceSubview:self.outlineView with:[self.outlineViewController view]];
   [self.splitView adjustSubviews];
   
-  [self setContentViewController:nil];
-  [self collapseOutlineView];
+  [self _setContentViewController:nil];
+  [self _collapseOutlineView];
 }
 
-- (void)setContentViewController:(MPViewController *)viewController {
+- (void)_setContentViewController:(MPViewController *)viewController {
   NSView *newContentView = self.welcomeView;
   if(viewController && viewController.view) {
     newContentView = viewController.view;
@@ -132,14 +136,14 @@
   [self.window makeFirstResponder:[viewController reconmendedFirstResponder]];
 }
 
-- (void)collapseOutlineView {
+- (void)_collapseOutlineView {
   NSView *outlineView = [self.splitView subviews][0];
   if(![outlineView isHidden]) {
     [self.splitView setPosition:0 ofDividerAtIndex:0];
   }
 }
 
-- (void)expandOutlineView {
+- (void)_expandOutlineView {
   NSView *outlineView = [self.splitView subviews][0];
   if([outlineView isHidden]) {
     [self.splitView setPosition:MPMainWindowSplitViewDelegateMinimumOutlineWidth ofDividerAtIndex:0];
@@ -172,7 +176,7 @@
     if(result == NSFileHandlingPanelOKButton) {
       NSURL *file = [[openPanel URLs] lastObject];
       self.passwordInputController.fileURL = file;
-      [self setContentViewController:self.passwordInputController];
+      [self _setContentViewController:self.passwordInputController];
     }
   }];
 }
@@ -196,6 +200,22 @@
   [self.outlineViewController clearSelection];
 }
 
+- (void)showEditForm:(id)sender {
+  if( ![MPDatabaseController hasOpenDatabase] ) {
+    return; // No database open - nothing to do;
+  }
+  
+  if(!self.entryEditController) {
+    self.entryEditController = [[[MPEntryEditController alloc] init] autorelease];
+  }
+  //find active selection
+  self.entryEditController.selectedItem = nil;
+  [self _setContentViewController:self.entryEditController];
+}
+
+
+#pragma mark Helper
+
 - (NSSearchField *)locateToolbarSearchField {
   for(NSToolbarItem *toolbarItem in [[self.window toolbar] items]) {
     NSView *view = [toolbarItem view];
@@ -213,11 +233,11 @@
 }
 
 - (void)showEntries {
-  [self expandOutlineView];
+  [self _expandOutlineView];
   if(!self.entryViewController) {
     _entryViewController = [[MPEntryViewController alloc] init];
   }
-  [self setContentViewController:self.entryViewController];
+  [self _setContentViewController:self.entryViewController];
 }
 
 - (IBAction)changedFileType:(id)sender {
diff --git a/MacPass/MPMainWindowSplitViewDelegate.m b/MacPass/MPMainWindowSplitViewDelegate.m
index 1148b587..d287ef95 100644
--- a/MacPass/MPMainWindowSplitViewDelegate.m
+++ b/MacPass/MPMainWindowSplitViewDelegate.m
@@ -13,23 +13,23 @@ const CGFloat MPMainWindowSplitViewDelegateMinimumContentWidth = 400.0;
 
 @interface MPMainWindowSplitViewDelegate ()
 
-- (NSView *)leftView:(NSSplitView *)splitView;
-- (NSView *)rightView:(NSSplitView *)splitView;
+- (NSView *)_leftView:(NSSplitView *)splitView;
+- (NSView *)_rightView:(NSSplitView *)splitView;
 
 @end
 
 @implementation MPMainWindowSplitViewDelegate
 
-- (NSView *)leftView:(NSSplitView *)splitView {
+- (NSView *)_leftView:(NSSplitView *)splitView {
   return [splitView subviews][0];
 }
 
-- (NSView *)rightView:(NSSplitView *)splitView {
+- (NSView *)_rightView:(NSSplitView *)splitView {
   return [splitView subviews][1];
 }
 
 - (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview {
-  return (subview == [self leftView:splitView]);
+  return (subview == [self _leftView:splitView]);
 }
 
 - (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex {
@@ -45,8 +45,8 @@ const CGFloat MPMainWindowSplitViewDelegateMinimumContentWidth = 400.0;
   NSSize newSize = [splitView frame].size;
   const CGFloat dividierThickness = [splitView dividerThickness];
   
-  NSView *leftView = [self leftView:splitView];
-  NSView *rightView = [self rightView:splitView];
+  NSView *leftView = [self _leftView:splitView];
+  NSView *rightView = [self _rightView:splitView];
   
   CGFloat leftWidth = [leftView isHidden] ? 0.0 : [leftView frame].size.width;
   NSRect newRightFrame = NSMakeRect(leftWidth + dividierThickness, 0, newSize.width - leftWidth - dividierThickness, newSize.height);
diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m
index 979548e7..93543830 100644
--- a/MacPass/MPOutlineViewController.m
+++ b/MacPass/MPOutlineViewController.m
@@ -21,9 +21,9 @@
 @property (retain) NSMenu *menu;
 
 
-- (void)didOpenDocument:(NSNotification *)notification;
-- (void)setupMenu;
-- (void)addEntry:(id)sender;
+- (void)_didOpenDocument:(NSNotification *)notification;
+- (void)_setupMenu;
+- (void)_addEntry:(id)sender;
 
 @end
 
@@ -40,10 +40,10 @@
     self.datasource = [[[MPOutlineDataSource alloc] init] autorelease];
     
     [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(didOpenDocument:)
+                                             selector:@selector(_didOpenDocument:)
                                                  name:MPDatabaseControllerDidLoadDatabaseNotification
                                                object:nil];
-    [self setupMenu];
+    [self _setupMenu];
   }
   
   return self;
@@ -65,7 +65,7 @@
   [self.outlineView setAllowsEmptySelection:YES];
 }
 
-- (void)didOpenDocument:(NSNotification *)notification {
+- (void)_didOpenDocument:(NSNotification *)notification {
   [self.outlineView reloadData];
   MPDatabaseController *dbContoller = [MPDatabaseController defaultController];
   if(dbContoller.database) {
@@ -77,7 +77,7 @@
   [self.outlineView deselectAll:nil];
 }
 
-- (void)setupMenu {
+- (void)_setupMenu {
   NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
   [menu addItemWithTitle:@"Add Group" action:@selector(addEntry:) keyEquivalent:@""];
   [menu addItem: [NSMenuItem separatorItem]];
@@ -90,7 +90,7 @@
   [menu release];
 }
 
-- (void)addEntry:(id)sender {
+- (void)_addEntry:(id)sender {
   NSLog(@"Add Entry");
 }
 
diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m
index 531febcd..29bcd0ff 100644
--- a/MacPass/MPPasswordInputController.m
+++ b/MacPass/MPPasswordInputController.m
@@ -13,9 +13,9 @@
 
 @property (assign) IBOutlet NSSecureTextField *passwordTextField;
 
-- (IBAction)selectKeyFile:(id)sender;
-- (IBAction)open:(id)sender;
-- (void)showError;
+- (IBAction)_selectKeyFile:(id)sender;
+- (IBAction)_open:(id)sender;
+- (void)_showError;
 
 @end
 
@@ -34,22 +34,22 @@
   return self.passwordTextField;
 }
 
-- (IBAction)selectKeyFile:(id)sender {
+- (IBAction)_selectKeyFile:(id)sender {
 
 }
 
-- (IBAction)open:(id)sender {
+- (IBAction)_open:(id)sender {
   NSString *password = [self.passwordTextField stringValue];
   [self.passwordTextField setStringValue:@""];
   MPDatabaseDocument *document = [[MPDatabaseController defaultController] openDatabase:self.fileURL
                                                                                password:password
                                                                                 keyfile:nil];
   if(!document) {
-    [self showError];
+    [self _showError];
   }
 }
 
-- (void)showError {
+- (void)_showError {
   NSLog(@"Something went wrong");
 }
 @end
diff --git a/MacPass/MPToolbarButton.h b/MacPass/MPToolbarButton.h
new file mode 100644
index 00000000..b34fb7a5
--- /dev/null
+++ b/MacPass/MPToolbarButton.h
@@ -0,0 +1,18 @@
+//
+//  MPButton.h
+//  MacPass
+//
+//  Created by michael starke on 26.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface MPToolbarButton : NSButton
+
+/* This methods ensure, that the button get sized correctly if used as the view in a NSToolbarItem*/
+- (void)setControlSize:(NSControlSize)controlSize;
+- (NSControlSize)controlSize;
+
+
+@end
diff --git a/MacPass/MPToolbarButton.m b/MacPass/MPToolbarButton.m
new file mode 100644
index 00000000..6c8786a5
--- /dev/null
+++ b/MacPass/MPToolbarButton.m
@@ -0,0 +1,36 @@
+//
+//  MPButton.m
+//  MacPass
+//
+//  Created by michael starke on 26.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPToolbarButton.h"
+
+@implementation MPToolbarButton
+
+- (void)setControlSize:(NSControlSize)controlSize {
+  [[self cell] setControlSize:controlSize];
+  switch (controlSize) {
+    case NSRegularControlSize:
+      [[self image] setSize:NSMakeSize(16, 16)];
+      break;
+    
+    case NSSmallControlSize:
+      [[self image] setSize:NSMakeSize(14, 14)];
+      break;
+    
+    case NSMiniControlSize:
+      [[self image] setSize:NSMakeSize(8, 8)];
+    
+    default:
+      break;
+  }
+}
+
+- (NSControlSize)controlSize {
+  return [[self cell] controlSize];
+}
+
+@end
diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index 72116fad..504a096c 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -10,6 +10,7 @@
 #import "MPIconHelper.h"
 #import "MPMainWindowController.h"
 #import "MPPathBar.h"
+#import "MPToolbarButton.h"
 
 NSString *const MPToolbarItemAddGroup = @"AddGroup";
 NSString *const MPToolbarItemAddEntry = @"AddEntry";
@@ -20,6 +21,7 @@ NSString *const MPToolbarItemSearch = @"Search";
 
 @interface MPToolbarDelegate()
 
+@property (retain) NSMutableDictionary *toolbarItems;
 @property (retain) NSArray *toolbarIdentifiers;
 @property (retain) NSDictionary *toolbarImages;
 
@@ -34,6 +36,7 @@ NSString *const MPToolbarItemSearch = @"Search";
   if (self) {
     self.toolbarIdentifiers = @[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemEdit, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, MPToolbarItemSearch ];
     self.toolbarImages = [self createToolbarImages];
+    self.toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]];
   }
   return self;
 }
@@ -42,11 +45,14 @@ NSString *const MPToolbarItemSearch = @"Search";
 {
   self.toolbarIdentifiers = nil;
   self.toolbarImages = nil;
+  self.toolbarItems = nil;
   [super dealloc];
 }
 
-- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag {  
-    NSToolbarItem *item = [[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier];
+- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag {
+  NSToolbarItem *item = self.toolbarItems[itemIdentifier];
+  if(!item) {    
+    item = [[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier];
     [item setAction:@selector(toolbarItemPressed:)];
     NSString *label = NSLocalizedString(itemIdentifier, @"");
     [item setLabel:label];
@@ -85,23 +91,24 @@ NSString *const MPToolbarItemSearch = @"Search";
        Cleanup
        */
       [menuItem release];
-      [menu release];      
+      [menu release];
       [item setView:popupButton];
       [popupButton release];
     }
     else {
-      NSButton *button = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)];
+      NSButton *button = [[MPToolbarButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)];
       [[button cell] setBezelStyle:NSTexturedRoundedBezelStyle];
       [[button cell] setImageScaling:NSImageScaleProportionallyDown];
       [button setTitle:itemIdentifier];
       [button setButtonType:NSMomentaryPushInButton];
       NSImage *image = self.toolbarImages[itemIdentifier];
+      [image setSize:NSMakeSize(16, 16)];
       [button setImage:image];
       [button setImagePosition:NSImageOnly];
       [button sizeToFit];
-      if([itemIdentifier isEqualToString:MPToolbarItemDelete]) {
+      if([itemIdentifier isEqualToString:MPToolbarItemEdit]) {
         [button setTarget:nil];
-        [button setAction:@selector(clearOutlineSelection:)];
+        [button setAction:@selector(showEditForm:)];
       }
       
       NSRect fittingRect = [button frame];
@@ -110,7 +117,10 @@ NSString *const MPToolbarItemSearch = @"Search";
       [item setView:button];
       [button release];
     }
-    return [item autorelease];
+    self.toolbarItems[itemIdentifier] = item;
+    [item release];
+  }
+  return item;
 }
 
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar {
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 58697cb0..77aba2fe 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>310</string>
+	<string>34B</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/PasswordInputView.xib b/MacPass/PasswordInputView.xib
index db2d995c..147e22a2 100644
--- a/MacPass/PasswordInputView.xib
+++ b/MacPass/PasswordInputView.xib
@@ -39,7 +39,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="1005">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSSecureTextField" id="219521947">
@@ -47,7 +47,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{128, 163}, {191, 22}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSecureTextFieldCell" key="NSCell" id="160320867">
@@ -91,7 +90,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{228, 127}, {97, 32}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="769513826"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -116,8 +114,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 166}, {64, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="108091909">
@@ -150,7 +146,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{77, 136}, {46, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="723622123"/>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
@@ -171,7 +166,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{251, 71}, {74, 32}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="736946738">
@@ -192,8 +186,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{447, 347}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="662046682"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -208,22 +200,6 @@
 					</object>
 					<int key="connectionID">143</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectKeyFile:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="723622123"/>
-					</object>
-					<int key="connectionID">152</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">open:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="769513826"/>
-					</object>
-					<int key="connectionID">154</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">passwordTextField</string>
@@ -232,6 +208,22 @@
 					</object>
 					<int key="connectionID">196</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">_selectKeyFile:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="723622123"/>
+					</object>
+					<int key="connectionID">198</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">_open:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="769513826"/>
+					</object>
+					<int key="connectionID">199</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
@@ -335,6 +327,22 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="957344773">
+								<reference key="firstItem" ref="333885704"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="723622123"/>
+								<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="1005"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="207368608">
 								<reference key="firstItem" ref="219521947"/>
 								<int key="firstAttribute">5</int>
@@ -415,22 +423,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="957344773">
-								<reference key="firstItem" ref="333885704"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="723622123"/>
-								<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="1005"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="72942573">
 								<reference key="firstItem" ref="662046682"/>
 								<int key="firstAttribute">6</int>
@@ -623,15 +615,15 @@
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
+				<array key="1.IBNSViewMetadataConstraints">
 					<reference ref="781301592"/>
 					<reference ref="72942573"/>
-					<reference ref="957344773"/>
 					<reference ref="151404172"/>
 					<reference ref="937587174"/>
 					<reference ref="679367678"/>
 					<reference ref="649511608"/>
 					<reference ref="207368608"/>
+					<reference ref="957344773"/>
 					<reference ref="862589174"/>
 					<reference ref="1041224580"/>
 					<reference ref="1001566026"/>
@@ -674,7 +666,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">197</int>
+			<int key="maxID">199</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/MacPass/SettingsWindow.xib b/MacPass/SettingsWindow.xib
index 3e04de8e..fc6a2c33 100644
--- a/MacPass/SettingsWindow.xib
+++ b/MacPass/SettingsWindow.xib
@@ -49,7 +49,7 @@
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -120,7 +120,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">80</int>
+			<int key="maxID">89</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">