diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 78fd7105..1f7eb149 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -260,8 +260,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */,
 				4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */,
+				4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */,
 				4CAD748C15B889B700104512 /* Security.framework in Frameworks */,
 				4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */,
 			);
@@ -273,15 +273,15 @@
 		4C06398C15B980480004DE27 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				4C25D58616CF0FAA00F6806C /* EntryView.xib */,
 				4CF5D49516D5B6E900CB78BD /* EntryEditView.xib */,
-				4C77E37B15B84A240093A587 /* MainMenu.xib */,
-				4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */,
 				4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */,
+				4C77E37B15B84A240093A587 /* MainMenu.xib */,
 				4CD884B615BD47080042BBF8 /* MainWindow.xib */,
+				4C61EA0416D2FFE200AC519E /* OutlineView.xib */,
+				4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */,
 				4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */,
 				4C25D58416CF0F8800F6806C /* WelcomeView.xib */,
-				4C25D58616CF0FAA00F6806C /* EntryView.xib */,
-				4C61EA0416D2FFE200AC519E /* OutlineView.xib */,
 				4C69A73816D589DF00EC1B1A /* MPGradientView.h */,
 				4C69A73916D589DF00EC1B1A /* MPGradientView.m */,
 			);
@@ -871,7 +871,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch";
 				INFOPLIST_FILE = "MacPass/MacPass-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -884,7 +884,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch";
 				INFOPLIST_FILE = "MacPass/MacPass-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
diff --git a/MacPass/EntryEditView.xib b/MacPass/EntryEditView.xib
index 0e80fe03..2231f22e 100644
--- a/MacPass/EntryEditView.xib
+++ b/MacPass/EntryEditView.xib
@@ -60,7 +60,6 @@
 						<string key="NSFrame">{{13, 10}, {482, 597}}</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">
@@ -678,7 +677,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 											<string key="NSFrame">{{382, 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">
@@ -740,7 +738,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews"/>
 									<string key="NSFrame">{{10, 33}, {462, 551}}</string>
-									<reference key="NSNextKeyView"/>
 									<string key="NSReuseIdentifierKey">_NS:28</string>
 								</object>
 								<string key="NSLabel">Advanced</string>
@@ -765,7 +762,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSImageView" id="491721175">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<set class="NSMutableSet" key="NSDragTypes">
 					<string>Apple PDF pasteboard type</string>
@@ -776,7 +773,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 					<string>NeXT TIFF v4.0 pasteboard type</string>
 				</set>
 				<string key="NSFrameSize">{54, 54}</string>
-				<reference key="NSSuperview"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<bool key="NSEnabled">YES</bool>
 				<object class="NSImageCell" key="NSCell" id="26384283">
diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index 5c632594..d6c82c7e 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -52,29 +52,28 @@
 						<reference key="NSNextResponder" ref="997686550"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSButton" id="1030871604">
+							<object class="NSButton" id="59573687">
 								<reference key="NSNextResponder" ref="488931024"/>
 								<int key="NSvFlags">268</int>
-								<array class="NSMutableArray" key="NSSubviews"/>
-								<string key="NSFrame">{{190, 5}, {122, 19}}</string>
+								<string key="NSFrame">{{244, 5}, {50, 17}}</string>
 								<reference key="NSSuperview" ref="488931024"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
+								<reference key="NSNextKeyView" ref="613995671"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="217820837">
-									<int key="NSCellFlags">-2080374784</int>
-									<int key="NSCellFlags2">134217728</int>
-									<string key="NSContents">Round Rect Button</string>
-									<object class="NSFont" key="NSSupport" id="156621333">
-										<string key="NSName">LucidaGrande</string>
+								<object class="NSButtonCell" key="NSCell" id="498304869">
+									<int key="NSCellFlags">67108864</int>
+									<int key="NSCellFlags2">134348800</int>
+									<string key="NSContents">Notes</string>
+									<object class="NSFont" key="NSSupport" id="29">
+										<string key="NSName">LucidaGrande-Bold</string>
 										<double key="NSSize">12</double>
 										<int key="NSfFlags">16</int>
 									</object>
 									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="1030871604"/>
+									<reference key="NSControlView" ref="59573687"/>
 									<int key="NSButtonFlags">-1232846848</int>
-									<int key="NSButtonFlags2">164</int>
+									<int key="NSButtonFlags2">173</int>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
@@ -82,25 +81,74 @@
 								</object>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
-							<object class="NSButton" id="857994692">
+							<object class="NSButton" id="914845652">
 								<reference key="NSNextResponder" ref="488931024"/>
 								<int key="NSvFlags">268</int>
-								<array class="NSMutableArray" key="NSSubviews"/>
-								<string key="NSFrame">{{60, 5}, {122, 19}}</string>
+								<string key="NSFrame">{{198, 5}, {38, 17}}</string>
 								<reference key="NSSuperview" ref="488931024"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
+								<reference key="NSNextKeyView" ref="59573687"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="551645450">
-									<int key="NSCellFlags">-2080374784</int>
-									<int key="NSCellFlags2">134217728</int>
-									<string key="NSContents">Round Rect Button</string>
-									<reference key="NSSupport" ref="156621333"/>
+								<object class="NSButtonCell" key="NSCell" id="668258978">
+									<int key="NSCellFlags">67108864</int>
+									<int key="NSCellFlags2">134348800</int>
+									<string key="NSContents">URL</string>
+									<reference key="NSSupport" ref="29"/>
 									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="857994692"/>
+									<reference key="NSControlView" ref="914845652"/>
 									<int key="NSButtonFlags">-1232846848</int>
-									<int key="NSButtonFlags2">164</int>
+									<int key="NSButtonFlags2">173</int>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							</object>
+							<object class="NSButton" id="346875213">
+								<reference key="NSNextResponder" ref="488931024"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{114, 5}, {76, 17}}</string>
+								<reference key="NSSuperview" ref="488931024"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="914845652"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="421681311">
+									<int key="NSCellFlags">67108864</int>
+									<int key="NSCellFlags2">134348800</int>
+									<string key="NSContents">Username</string>
+									<reference key="NSSupport" ref="29"/>
+									<string key="NSCellIdentifier">_NS:9</string>
+									<reference key="NSControlView" ref="346875213"/>
+									<int key="NSButtonFlags">-1232846848</int>
+									<int key="NSButtonFlags2">173</int>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							</object>
+							<object class="NSButton" id="486078330">
+								<reference key="NSNextResponder" ref="488931024"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{64, 5}, {42, 17}}</string>
+								<reference key="NSSuperview" ref="488931024"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="346875213"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="917963484">
+									<int key="NSCellFlags">-2080374784</int>
+									<int key="NSCellFlags2">142737408</int>
+									<string key="NSContents">Title</string>
+									<reference key="NSSupport" ref="29"/>
+									<string key="NSCellIdentifier">_NS:9</string>
+									<reference key="NSControlView" ref="486078330"/>
+									<int key="NSButtonFlags">-1232846848</int>
+									<int key="NSButtonFlags2">173</int>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
@@ -111,27 +159,20 @@
 							<object class="NSTextField" id="238723868">
 								<reference key="NSNextResponder" ref="488931024"/>
 								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{17, 7}, {38, 17}}</string>
+								<string key="NSFrame">{{7, 7}, {52, 17}}</string>
 								<reference key="NSSuperview" ref="488931024"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="857994692"/>
-								<object class="NSShadow" key="NSViewShadow">
-									<double key="NSShadowVert">1</double>
-									<object class="NSColor" key="NSShadowColor" id="57651127">
-										<int key="NSColorSpace">1</int>
-										<bytes key="NSRGB">MSAxIDEAA</bytes>
-									</object>
-								</object>
+								<reference key="NSNextKeyView" ref="486078330"/>
 								<string key="NSReuseIdentifierKey">_NS:1535</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSTextFieldCell" key="NSCell" id="9066510">
 									<int key="NSCellFlags">68157504</int>
 									<int key="NSCellFlags2">272630784</int>
-									<string key="NSContents">Label</string>
-									<object class="NSFont" key="NSSupport" id="454123306">
-										<string key="NSName">LucidaGrande</string>
+									<string key="NSContents">Search:</string>
+									<object class="NSFont" key="NSSupport">
+										<string key="NSName">LucidaGrande-Bold</string>
 										<double key="NSSize">13</double>
-										<int key="NSfFlags">1044</int>
+										<int key="NSfFlags">2072</int>
 									</object>
 									<string key="NSCellIdentifier">_NS:1535</string>
 									<reference key="NSControlView" ref="238723868"/>
@@ -157,11 +198,10 @@
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 297}, {522, 30}}</string>
+						<string key="NSFrame">{{0, 450}, {610, 30}}</string>
 						<reference key="NSSuperview" ref="997686550"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="238723868"/>
-						<bool key="NSViewIsLayerTreeHost">YES</bool>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSClassName">MPGradientView</string>
 					</object>
@@ -177,7 +217,7 @@
 										<reference key="NSNextResponder" ref="262664416"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews"/>
-										<string key="NSFrameSize">{522, 280}</string>
+										<string key="NSFrameSize">{610, 433}</string>
 										<reference key="NSSuperview" ref="262664416"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="788738248"/>
@@ -188,7 +228,7 @@
 										<object class="NSTableHeaderView" key="NSHeaderView" id="778100560">
 											<reference key="NSNextResponder" ref="737075944"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{522, 17}</string>
+											<string key="NSFrameSize">{610, 17}</string>
 											<reference key="NSSuperview" ref="737075944"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="262664416"/>
@@ -240,7 +280,11 @@
 													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
-													<reference key="NSSupport" ref="454123306"/>
+													<object class="NSFont" key="NSSupport" id="454123306">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">1044</int>
+													</object>
 													<reference key="NSControlView" ref="528076956"/>
 													<object class="NSColor" key="NSBackgroundColor" id="136901388">
 														<int key="NSColorSpace">6</int>
@@ -289,7 +333,7 @@
 											</object>
 											<object class="NSTableColumn" id="203082423">
 												<string key="NSIdentifier">Password Column</string>
-												<double key="NSWidth">85.1015625</double>
+												<double key="NSWidth">116.6953125</double>
 												<double key="NSMinWidth">10</double>
 												<double key="NSMaxWidth">3.4028234663852886e+38</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -316,7 +360,7 @@
 											</object>
 											<object class="NSTableColumn" id="956759754">
 												<string key="NSIdentifier">URL Column</string>
-												<double key="NSWidth">183</double>
+												<double key="NSWidth">239</double>
 												<double key="NSMinWidth">10</double>
 												<double key="NSMaxWidth">3.4028234663852886e+38</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -366,7 +410,7 @@
 										<int key="NSTableViewGroupRowStyle">1</int>
 									</object>
 								</array>
-								<string key="NSFrame">{{0, 17}, {522, 280}}</string>
+								<string key="NSFrame">{{0, 17}, {610, 433}}</string>
 								<reference key="NSSuperview" ref="613995671"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="528076956"/>
@@ -395,7 +439,6 @@
 								<string key="NSFrame">{{0, 245}, {359, 16}}</string>
 								<reference key="NSSuperview" ref="613995671"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:60</string>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
@@ -409,7 +452,7 @@
 								<array class="NSMutableArray" key="NSSubviews">
 									<reference ref="778100560"/>
 								</array>
-								<string key="NSFrameSize">{522, 17}</string>
+								<string key="NSFrameSize">{610, 17}</string>
 								<reference key="NSSuperview" ref="613995671"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="778100560"/>
@@ -419,7 +462,7 @@
 								<int key="NScvFlags">4</int>
 							</object>
 						</array>
-						<string key="NSFrameSize">{522, 297}</string>
+						<string key="NSFrameSize">{610, 450}</string>
 						<reference key="NSSuperview" ref="997686550"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="737075944"/>
@@ -435,7 +478,7 @@
 						<double key="NSMagnification">1</double>
 					</object>
 				</array>
-				<string key="NSFrameSize">{522, 327}</string>
+				<string key="NSFrameSize">{610, 480}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="488931024"/>
@@ -461,6 +504,76 @@
 					</object>
 					<int key="connectionID">395</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">searchLabelTextField</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="238723868"/>
+					</object>
+					<int key="connectionID">437</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">statusBar</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="488931024"/>
+					</object>
+					<int key="connectionID">520</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">entryTableScrollView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="613995671"/>
+					</object>
+					<int key="connectionID">562</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">statusBarToTop</string>
+						<reference key="source" ref="1001"/>
+						<object class="IBNSLayoutConstraint" key="destination" id="805657812">
+							<reference key="firstItem" ref="488931024"/>
+							<int key="firstAttribute">3</int>
+							<int key="relation">0</int>
+							<reference key="secondItem" ref="997686550"/>
+							<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="997686550"/>
+							<int key="scoringType">9</int>
+							<float key="scoringTypeFloat">40</float>
+							<int key="contentType">3</int>
+						</object>
+					</object>
+					<int key="connectionID">575</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableToTop</string>
+						<reference key="source" ref="1001"/>
+						<object class="IBNSLayoutConstraint" key="destination" id="317572742">
+							<reference key="firstItem" ref="613995671"/>
+							<int key="firstAttribute">3</int>
+							<int key="relation">0</int>
+							<reference key="secondItem" ref="997686550"/>
+							<int key="secondAttribute">3</int>
+							<float key="multiplier">1</float>
+							<object class="IBLayoutConstant" key="constant">
+								<double key="value">30</double>
+							</object>
+							<float key="priority">1000</float>
+							<reference key="containingView" ref="997686550"/>
+							<int key="scoringType">9</int>
+							<float key="scoringTypeFloat">40</float>
+							<int key="contentType">3</int>
+						</object>
+					</object>
+					<int key="connectionID">577</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField</string>
@@ -582,7 +695,7 @@
 								<object class="NSTextField" id="441850286">
 									<reference key="NSNextResponder" ref="542633869"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrameSize">{183, 17}</string>
+									<string key="NSFrameSize">{239, 17}</string>
 									<reference key="NSSuperview" ref="542633869"/>
 									<reference key="NSNextKeyView" ref="1037276411"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -599,7 +712,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{337, 1}, {183, 17}}</string>
+							<string key="NSFrame">{{369, 1}, {239, 17}}</string>
 							<reference key="NSNextKeyView" ref="441850286"/>
 						</object>
 						<reference key="destination" ref="441850286"/>
@@ -616,7 +729,7 @@
 								<object class="NSTextField" id="1042596093">
 									<reference key="NSNextResponder" ref="878614701"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrameSize">{85, 17}</string>
+									<string key="NSFrameSize">{117, 17}</string>
 									<reference key="NSSuperview" ref="878614701"/>
 									<reference key="NSNextKeyView" ref="542633869"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -633,7 +746,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{249, 1}, {85, 17}}</string>
+							<string key="NSFrame">{{249, 1}, {117, 17}}</string>
 							<reference key="NSNextKeyView" ref="1042596093"/>
 						</object>
 						<reference key="destination" ref="1042596093"/>
@@ -671,38 +784,7 @@
 						<int key="objectID">336</int>
 						<reference key="object" ref="997686550"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="393894766">
-								<reference key="firstItem" ref="613995671"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="488931024"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="997686550"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="929020479">
-								<reference key="firstItem" ref="613995671"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="997686550"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">30</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="997686550"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
+							<reference ref="317572742"/>
 							<object class="IBNSLayoutConstraint" id="945226060">
 								<reference key="firstItem" ref="613995671"/>
 								<int key="firstAttribute">6</int>
@@ -751,28 +833,12 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="805657812">
+							<object class="IBNSLayoutConstraint" id="573866726">
 								<reference key="firstItem" ref="488931024"/>
-								<int key="firstAttribute">3</int>
+								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="997686550"/>
-								<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="997686550"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="292531214">
-								<reference key="firstItem" ref="488931024"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="997686550"/>
-								<int key="secondAttribute">6</int>
+								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -783,12 +849,13 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="573866726">
+							<reference ref="805657812"/>
+							<object class="IBNSLayoutConstraint" id="292531214">
 								<reference key="firstItem" ref="488931024"/>
-								<int key="firstAttribute">5</int>
+								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="997686550"/>
-								<int key="secondAttribute">5</int>
+								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -808,11 +875,43 @@
 						<int key="objectID">349</int>
 						<reference key="object" ref="488931024"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="330269555">
+								<reference key="firstItem" ref="59573687"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="488931024"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="488931024"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="477587411">
+								<reference key="firstItem" ref="59573687"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="914845652"/>
+								<int key="secondAttribute">6</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="488931024"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="582205783">
-								<reference key="firstItem" ref="1030871604"/>
+								<reference key="firstItem" ref="59573687"/>
 								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="857994692"/>
+								<reference key="secondItem" ref="914845652"/>
 								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -824,11 +923,27 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="477587411">
-								<reference key="firstItem" ref="1030871604"/>
+							<object class="IBNSLayoutConstraint" id="398918094">
+								<reference key="firstItem" ref="914845652"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="346875213"/>
+								<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="488931024"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="40326394">
+								<reference key="firstItem" ref="914845652"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="857994692"/>
+								<reference key="secondItem" ref="346875213"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -840,12 +955,12 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="784685680">
-								<reference key="firstItem" ref="857994692"/>
-								<int key="firstAttribute">3</int>
+							<object class="IBNSLayoutConstraint" id="478255548">
+								<reference key="firstItem" ref="914845652"/>
+								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="238723868"/>
-								<int key="secondAttribute">3</int>
+								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -856,8 +971,40 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="399431292">
-								<reference key="firstItem" ref="857994692"/>
+							<object class="IBNSLayoutConstraint" id="860240288">
+								<reference key="firstItem" ref="346875213"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="486078330"/>
+								<int key="secondAttribute">6</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="488931024"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="93247059">
+								<reference key="firstItem" ref="346875213"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="486078330"/>
+								<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="488931024"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="597009469">
+								<reference key="firstItem" ref="486078330"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="238723868"/>
@@ -872,36 +1019,20 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="667053711">
-								<reference key="firstItem" ref="238723868"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="488931024"/>
-								<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="488931024"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="190004029">
+							<object class="IBNSLayoutConstraint" id="906997605">
 								<reference key="firstItem" ref="238723868"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="488931024"/>
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">10</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="488931024"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="471309934">
@@ -921,8 +1052,10 @@
 								<int key="contentType">1</int>
 							</object>
 							<reference ref="238723868"/>
-							<reference ref="857994692"/>
-							<reference ref="1030871604"/>
+							<reference ref="486078330"/>
+							<reference ref="346875213"/>
+							<reference ref="914845652"/>
+							<reference ref="59573687"/>
 						</array>
 						<reference key="parent" ref="997686550"/>
 					</object>
@@ -944,62 +1077,6 @@
 						<reference key="object" ref="9066510"/>
 						<reference key="parent" ref="238723868"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">378</int>
-						<reference key="object" ref="190004029"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">380</int>
-						<reference key="object" ref="857994692"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="551645450"/>
-						</array>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">381</int>
-						<reference key="object" ref="551645450"/>
-						<reference key="parent" ref="857994692"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">385</int>
-						<reference key="object" ref="399431292"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">386</int>
-						<reference key="object" ref="784685680"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">387</int>
-						<reference key="object" ref="1030871604"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="217820837"/>
-						</array>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">388</int>
-						<reference key="object" ref="217820837"/>
-						<reference key="parent" ref="1030871604"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">389</int>
-						<reference key="object" ref="477587411"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">390</int>
-						<reference key="object" ref="582205783"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">392</int>
-						<reference key="object" ref="667053711"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">54</int>
 						<reference key="object" ref="613995671"/>
@@ -1021,11 +1098,6 @@
 						<reference key="object" ref="647884172"/>
 						<reference key="parent" ref="997686550"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">344</int>
-						<reference key="object" ref="67428983"/>
-						<reference key="parent" ref="997686550"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">55</int>
 						<reference key="object" ref="528076956"/>
@@ -1381,26 +1453,6 @@
 						<reference key="object" ref="1037276411"/>
 						<reference key="parent" ref="613995671"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">350</int>
-						<reference key="object" ref="573866726"/>
-						<reference key="parent" ref="997686550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">396</int>
-						<reference key="object" ref="393894766"/>
-						<reference key="parent" ref="997686550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">393</int>
-						<reference key="object" ref="929020479"/>
-						<reference key="parent" ref="997686550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">417</int>
-						<reference key="object" ref="805657812"/>
-						<reference key="parent" ref="997686550"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">418</int>
 						<reference key="object" ref="471309934"/>
@@ -1588,6 +1640,128 @@
 						<reference key="object" ref="536648739"/>
 						<reference key="parent" ref="878614701"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">442</int>
+						<reference key="object" ref="486078330"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="917963484"/>
+						</array>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">443</int>
+						<reference key="object" ref="917963484"/>
+						<reference key="parent" ref="486078330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">447</int>
+						<reference key="object" ref="346875213"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="421681311"/>
+						</array>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">448</int>
+						<reference key="object" ref="421681311"/>
+						<reference key="parent" ref="346875213"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">452</int>
+						<reference key="object" ref="914845652"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="668258978"/>
+						</array>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">453</int>
+						<reference key="object" ref="668258978"/>
+						<reference key="parent" ref="914845652"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">456</int>
+						<reference key="object" ref="59573687"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="498304869"/>
+						</array>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">457</int>
+						<reference key="object" ref="498304869"/>
+						<reference key="parent" ref="59573687"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">478</int>
+						<reference key="object" ref="906997605"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">484</int>
+						<reference key="object" ref="597009469"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">490</int>
+						<reference key="object" ref="93247059"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="860240288"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">495</int>
+						<reference key="object" ref="478255548"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">496</int>
+						<reference key="object" ref="40326394"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">497</int>
+						<reference key="object" ref="398918094"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">500</int>
+						<reference key="object" ref="582205783"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">501</int>
+						<reference key="object" ref="477587411"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">502</int>
+						<reference key="object" ref="330269555"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">344</int>
+						<reference key="object" ref="67428983"/>
+						<reference key="parent" ref="997686550"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">576</int>
+						<reference key="object" ref="573866726"/>
+						<reference key="parent" ref="997686550"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">572</int>
+						<reference key="object" ref="317572742"/>
+						<reference key="parent" ref="997686550"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">561</int>
+						<reference key="object" ref="805657812"/>
+						<reference key="parent" ref="997686550"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1653,53 +1827,46 @@
 				<string key="328.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="329.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="330.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="336.IBNSViewMetadataConstraints">
-					<reference ref="573866726"/>
+				<array key="336.IBNSViewMetadataConstraints">
 					<reference ref="292531214"/>
 					<reference ref="805657812"/>
+					<reference ref="573866726"/>
 					<reference ref="67428983"/>
 					<reference ref="647884172"/>
 					<reference ref="945226060"/>
-					<reference ref="929020479"/>
-					<reference ref="393894766"/>
+					<reference ref="317572742"/>
 				</array>
+				<boolean value="YES" key="336.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="344.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="349.IBNSViewMetadataConstraints">
+				<array class="NSMutableArray" key="349.IBNSViewMetadataConstraints">
 					<reference ref="471309934"/>
-					<reference ref="190004029"/>
-					<reference ref="667053711"/>
-					<reference ref="399431292"/>
-					<reference ref="784685680"/>
-					<reference ref="477587411"/>
+					<reference ref="906997605"/>
+					<reference ref="597009469"/>
+					<reference ref="93247059"/>
+					<reference ref="860240288"/>
+					<reference ref="478255548"/>
+					<reference ref="40326394"/>
+					<reference ref="398918094"/>
 					<reference ref="582205783"/>
+					<reference ref="477587411"/>
+					<reference ref="330269555"/>
 				</array>
 				<boolean value="NO" key="349.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="357.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="370.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<reference key="370.IBViewIntegration.shadowColor" ref="57651127"/>
+				<real value="0.0" key="370.IBViewIntegration.shadowBlurRadius"/>
+				<object class="NSColor" key="370.IBViewIntegration.shadowColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MSAxIDEAA</bytes>
+				</object>
 				<real value="1" key="370.IBViewIntegration.shadowOffsetHeight"/>
+				<real value="0.0" key="370.IBViewIntegration.shadowOffsetWidth"/>
 				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="378.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="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="387.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="387.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="390.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="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="417.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="418.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="419.isInViewBasedMode"/>
@@ -1733,19 +1900,44 @@
 				<string key="432.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="433.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="434.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="442.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="442.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="443.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="447.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="448.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="452.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="456.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="484.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="495.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="496.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="497.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="500.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="501.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="502.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="54.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="55.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="572.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="576.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">434</int>
+			<int key="maxID">579</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1754,17 +1946,32 @@
 					<string key="superclassName">MPViewController</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="entryTable">NSTableView</string>
+						<string key="searchLabelTextField">NSTextField</string>
 						<string key="statusBar">NSView</string>
+						<string key="statusBarToTop">NSLayoutConstraint</string>
+						<string key="tableToTop">NSLayoutConstraint</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="entryTable">
 							<string key="name">entryTable</string>
 							<string key="candidateClassName">NSTableView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="searchLabelTextField">
+							<string key="name">searchLabelTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="statusBar">
 							<string key="name">statusBar</string>
 							<string key="candidateClassName">NSView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="statusBarToTop">
+							<string key="name">statusBarToTop</string>
+							<string key="candidateClassName">NSLayoutConstraint</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="tableToTop">
+							<string key="name">tableToTop</string>
+							<string key="candidateClassName">NSLayoutConstraint</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index f3c031da..bbc9549f 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -13,6 +13,10 @@
 #import "MPIconHelper.h"
 #import "KdbGroup+MPAdditions.h"
 
+#import <QuartzCore/QuartzCore.h>
+
+#define STATUS_BAR_ANIMATION_TIME 0.2
+
 NSString *const MPEntryTableUserNameColumnIdentifier = @"MPUserNameColumnIdentifier";
 NSString *const MPEntryTableTitleColumnIdentifier = @"MPTitleColumnIdentifier";
 NSString *const MPEntryTablePasswordColumnIdentifier = @"MPPasswordColumnIdentifier";
@@ -28,11 +32,17 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 @property (retain) NSArray *filteredEntries;
 @property (assign) IBOutlet NSTableView *entryTable;
 @property (assign) IBOutlet NSView *statusBar;
+@property (assign) IBOutlet NSTextField *searchLabelTextField;
+@property (assign) BOOL isStatusBarVisible;
+@property (retain) IBOutlet NSLayoutConstraint *statusBarToTop;
+@property (retain) IBOutlet NSLayoutConstraint *tableToTop;
 
 
-- (BOOL)hasActiveFilter;
+- (BOOL)hasFilter;
 - (void)updateFilter;
 - (void)didChangeGroupSelectionInOutlineView:(NSNotification *)notification;
+- (void)showStatusBarAnimated:(BOOL)animate;
+- (void)hideStatusBarAnimated:(BOOL)animate;
 
 @end
 
@@ -46,6 +56,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
   if(self) {
+    _isStatusBarVisible = YES;
     _entryArrayController = [[NSArrayController alloc] init];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didChangeGroupSelectionInOutlineView:)
@@ -57,8 +68,11 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 
 - (void)didLoadView {
   
+  [self.view setWantsLayer:YES];
+  [self hideStatusBarAnimated:NO];
+  [[self.searchLabelTextField cell] setBackgroundStyle:NSBackgroundStyleRaised];
   [self.entryTable setDelegate:self];
-
+  
   NSTableColumn *parentColumn = [self.entryTable tableColumns][0];
   NSTableColumn *titleColumn = [self.entryTable tableColumns][1];
   NSTableColumn *userNameColumn = [self.entryTable tableColumns][2];
@@ -83,7 +97,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 
 - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
   KdbEntry *entry = [self.entryArrayController arrangedObjects][row];
-
+  
   const BOOL isTitleColumn = [[tableColumn identifier] isEqualToString:MPEntryTableTitleColumnIdentifier];
   const BOOL isGroupColumn = [[tableColumn identifier] isEqualToString:MPEntryTableParentColumnIdentifier];
   const BOOL isPasswordColum = [[tableColumn identifier] isEqualToString:MPEntryTablePasswordColumnIdentifier];
@@ -103,7 +117,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   }
   
   if( isPasswordColum ) {
-      view = [tableView makeViewWithIdentifier:_MPTAbleSecurCellView owner:self];
+    view = [tableView makeViewWithIdentifier:_MPTAbleSecurCellView owner:self];
     [[view textField] setStringValue:entry.password];
     return view;
   }
@@ -119,15 +133,9 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 
 #pragma mark Notifications
 - (void)didChangeGroupSelectionInOutlineView:(NSNotification *)notification {
-  /*
-   If we have an active search, do not mess with the content
-   */
-  if([self hasActiveFilter]) {
-    return;
-  }
-  else {
-    [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
-  }
+  
+  self.filter = @""; // will update the reast automatically
+  
   MPOutlineViewDelegate *delegate = [notification object];
   KdbGroup *group = delegate.selectedGroup;
   if(group) {
@@ -140,7 +148,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 
 #pragma mark Filtering
 
-- (BOOL)hasActiveFilter {
+- (BOOL)hasFilter {
   return ([self.filter length] > 0);
 }
 
@@ -154,21 +162,16 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 
 - (void)updateFilter {
   MPDatabaseDocument *openDatabase = [MPDatabaseController defaultController].database;
-  if(openDatabase) {
+  if(openDatabase && [self hasFilter]) {
+    [self showStatusBarAnimated:YES];
     
-    /*
-     Search in the background
-     */
     dispatch_queue_t backgroundQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
     dispatch_async(backgroundQueue, ^{
-      if([self.filter length] == 0) {
-        self.filteredEntries = [openDatabase.root childEntries];
-      }
-      else {
-        NSPredicate *filterPredicate = [NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", self.filter];
-        self.filteredEntries = [[openDatabase.root childEntries] filteredArrayUsingPredicate:filterPredicate];
-      }
-      dispatch_async(dispatch_get_main_queue(), ^{
+      
+      NSPredicate *filterPredicate = [NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", self.filter];
+      self.filteredEntries = [[openDatabase.root childEntries] filteredArrayUsingPredicate:filterPredicate];
+      
+      dispatch_sync(dispatch_get_main_queue(), ^{
         [self.entryArrayController setContent:self.filteredEntries];
         [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:NO];
       });
@@ -177,6 +180,53 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   else {
     [self.entryArrayController setContent:nil];
     self.filteredEntries = nil;
+    [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
+    [self hideStatusBarAnimated:YES];
+  }
+}
+
+#pragma mark Animation
+
+- (void)showStatusBarAnimated:(BOOL)animate {
+  
+  if(self.isStatusBarVisible) {
+    return; // nothign to to
+  }
+  self.isStatusBarVisible = YES;
+  self.statusBarToTop.constant = 0;
+  self.tableToTop.constant = [self.statusBar frame].size.height;
+    
+  if(animate) {
+    [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
+      context.duration = STATUS_BAR_ANIMATION_TIME;
+      context.allowsImplicitAnimation = YES;
+      [self.view layoutSubtreeIfNeeded];
+    } completionHandler:nil] ;
+  }
+  else {
+    [self.view layoutSubtreeIfNeeded];
+  }
+}
+
+- (void)hideStatusBarAnimated:(BOOL)animate {
+  
+  if(!self.isStatusBarVisible) {
+    return; // nothing to do;
+  }
+  
+  self.isStatusBarVisible = NO;
+  self.statusBarToTop.constant = -[self.statusBar frame].size.height;
+  self.tableToTop.constant = -1;
+  
+  if(animate) {
+    [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
+      context.duration = STATUS_BAR_ANIMATION_TIME;
+      context.allowsImplicitAnimation = YES;
+      [self.view layoutSubtreeIfNeeded];
+    } completionHandler:nil] ;
+  }
+  else {
+    [self.view layoutSubtreeIfNeeded];
   }
 }
 
diff --git a/MacPass/MPGradientView.m b/MacPass/MPGradientView.m
index b3f3aad4..cb134a80 100644
--- a/MacPass/MPGradientView.m
+++ b/MacPass/MPGradientView.m
@@ -20,7 +20,6 @@
 
 @implementation MPGradientView
 
-
 - (id)initWithFrame:(NSRect)frameRect {
   NSColor *activeTop = [NSColor colorWithCalibratedWhite:0.85 alpha:1];
   NSColor *activeBottom = [NSColor colorWithCalibratedWhite:0.7 alpha:1];
@@ -40,12 +39,17 @@
   return self;
 }
 
+#pragma mark Drawing
 
 - (void)drawRect:(NSRect)dirtyRect {
+  /*
+   We draw a Gradient, so make sure we always redraw the full view
+   */
   NSGradient *gradient = self.isRenderedActive ? self.activeGradient : self.inactiveGradient;
-  [gradient drawInRect:dirtyRect angle:90];
+  [gradient drawInRect:self.bounds angle:90];
 }
 
+#pragma mark State Refresh
 - (void)_registerWindow:(NSWindow *)newWindow {
   if([self window]) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:[self window]];
@@ -55,7 +59,6 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshActiveState) name:NSWindowDidBecomeKeyNotification object:newWindow];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshActiveState) name:NSWindowDidResignKeyNotification object:newWindow];
   }
-  
 }
 
 - (void)viewWillMoveToWindow:(NSWindow *)newWindow {
@@ -67,6 +70,7 @@
   self.isRenderedActive = [[self window] isKeyWindow];
 }
 
+# pragma mark Custom Properties
 - (void)setIsRenderedActive:(BOOL)isRenderedActive {
   if(_isRenderedActive != isRenderedActive) {
     _isRenderedActive = isRenderedActive;
diff --git a/MacPass/MPMainWindowController.m b/MacPass/MPMainWindowController.m
index 929b1b13..03a200ec 100644
--- a/MacPass/MPMainWindowController.m
+++ b/MacPass/MPMainWindowController.m
@@ -16,12 +16,12 @@
 
 @interface MPMainWindowController ()
 
-
 @property (assign) IBOutlet NSView *outlineView;
 @property (assign) IBOutlet NSSplitView *splitView;
 @property (assign) IBOutlet NSView *contentView;
 
 @property (retain) IBOutlet NSView *welcomeView;
+@property (assign) IBOutlet NSTextField *welcomeText;
 @property (retain) NSToolbar *toolbar;
 
 @property (retain) MPPasswordInputController *passwordInputController;
@@ -31,6 +31,9 @@
 @property (retain) MPToolbarDelegate *toolbarDelegate;
 @property (retain) MPMainWindowSplitViewDelegate *splitViewDelegate;
 
+- (void)collapseOutlineView;
+- (void)expandOutlineView;
+
 @end
 
 @implementation MPMainWindowController
@@ -58,9 +61,14 @@
   [super dealloc];
 }
 
+#pragma mark View Handling
+
 - (void)windowDidLoad
 {
   [super windowDidLoad];
+  
+  [[self.welcomeText cell] setBackgroundStyle:NSBackgroundStyleRaised];
+  
   const CGFloat minimumWindowWidth = MPMainWindowSplitViewDelegateMinimumContentWidth + MPMainWindowSplitViewDelegateMinimumOutlineWidth + [self.splitView dividerThickness];
   [self.window setMinSize:NSMakeSize( minimumWindowWidth, 400)];
   
@@ -72,13 +80,13 @@
   [self.splitView setDelegate:self.splitViewDelegate];
   
   NSRect frame = [self.outlineView frame];
-//  frame.size.height -= 1;
-//  frame.origin.y = 10;
   [self.outlineViewController.view setFrame:frame];
   [self.outlineViewController.view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
   [self.splitView replaceSubview:self.outlineView with:[self.outlineViewController view]];
   [self.splitView adjustSubviews];
+  
   [self setContentViewController:nil];
+  [self collapseOutlineView];
 }
 
 - (void)setContentViewController:(MPViewController *)viewController {
@@ -113,6 +121,21 @@
   [self.window makeFirstResponder:[viewController reconmendedFirstResponder]];
 }
 
+- (void)collapseOutlineView {
+  NSView *outlineView = [self.splitView subviews][0];
+  if(![outlineView isHidden]) {
+    [self.splitView setPosition:0 ofDividerAtIndex:0];
+  }
+}
+
+- (void)expandOutlineView {
+  NSView *outlineView = [self.splitView subviews][0];
+  if([outlineView isHidden]) {
+    [self.splitView setPosition:MPMainWindowSplitViewDelegateMinimumOutlineWidth ofDividerAtIndex:0];
+
+  }
+}
+
 #pragma mark Actions
 
 - (void)performFindPanelAction:(id)sender {
@@ -124,7 +147,7 @@
 }
 
 - (void)openDocument:(id)sender {
-  
+ 
   if(!self.passwordInputController) {
     self.passwordInputController = [[[MPPasswordInputController alloc] init] autorelease];
   }
@@ -134,6 +157,7 @@
   [openPanel setCanChooseFiles:YES];
   [openPanel setCanCreateDirectories:NO];
   [openPanel setAllowsMultipleSelection:NO];
+  [openPanel setAllowedFileTypes:@[ @"kdbx", @"kdb"]];
   [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result){
     if(result == NSFileHandlingPanelOKButton) {
       NSURL *file = [[openPanel URLs] lastObject];
@@ -155,10 +179,13 @@
 }
 
 - (void)showEntries {
+  [self expandOutlineView];
   if(!self.entryViewController) {
     _entryViewController = [[MPEntryViewController alloc] init];
   }
   [self setContentViewController:self.entryViewController];
 }
 
+- (IBAction)changedFileType:(id)sender {
+}
 @end
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 14e8a0a0..640ad819 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>15D</string>
+	<string>1C8</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/WelcomeView.xib b/MacPass/WelcomeView.xib
index 7acbe263..913687c3 100644
--- a/MacPass/WelcomeView.xib
+++ b/MacPass/WelcomeView.xib
@@ -41,17 +41,10 @@
 					<object class="NSTextField" id="86698766">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{210, 211}, {177, 34}}</string>
+						<string key="NSFrame">{{223, 214}, {152, 29}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView"/>
-						<object class="NSShadow" key="NSViewShadow">
-							<double key="NSShadowVert">1</double>
-							<object class="NSColor" key="NSShadowColor" id="214915299">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MSAxIDEAA</bytes>
-							</object>
-						</object>
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="726130946">
@@ -60,7 +53,7 @@
 							<string key="NSContents">No Database</string>
 							<object class="NSFont" key="NSSupport">
 								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">28</double>
+								<double key="NSSize">24</double>
 								<int key="NSfFlags">16</int>
 							</object>
 							<string key="NSCellIdentifier">_NS:1535</string>
@@ -91,7 +84,6 @@
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="86698766"/>
-				<bool key="NSViewIsLayerTreeHost">YES</bool>
 				<string key="NSClassName">NSView</string>
 			</object>
 		</array>
@@ -105,6 +97,14 @@
 					</object>
 					<int key="connectionID">12</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">welcomeText</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="86698766"/>
+					</object>
+					<int key="connectionID">17</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -136,27 +136,11 @@
 						<int key="objectID">1</int>
 						<reference key="object" ref="1005"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="400794400">
-								<reference key="firstItem" ref="1005"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="86698766"/>
-								<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">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="121551590">
-								<reference key="firstItem" ref="1005"/>
+							<object class="IBNSLayoutConstraint" id="7631442">
+								<reference key="firstItem" ref="86698766"/>
 								<int key="firstAttribute">9</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="86698766"/>
+								<reference key="secondItem" ref="1005"/>
 								<int key="secondAttribute">9</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -164,8 +148,24 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="790404227">
+								<reference key="firstItem" ref="86698766"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<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">5</int>
+								<float key="scoringTypeFloat">22</float>
 								<int key="contentType">2</int>
 							</object>
 							<reference ref="86698766"/>
@@ -186,13 +186,13 @@
 						<reference key="parent" ref="86698766"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="121551590"/>
+						<int key="objectID">21</int>
+						<reference key="object" ref="790404227"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="400794400"/>
+						<int key="objectID">22</int>
+						<reference key="object" ref="7631442"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 				</array>
@@ -202,46 +202,39 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
-					<reference ref="121551590"/>
-					<reference ref="400794400"/>
+					<reference ref="790404227"/>
+					<reference ref="7631442"/>
 				</array>
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<reference key="2.IBViewIntegration.shadowColor" ref="214915299"/>
+				<real value="0.0" key="2.IBViewIntegration.shadowBlurRadius"/>
+				<object class="NSColor" key="2.IBViewIntegration.shadowColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MSAxIDEAA</bytes>
+				</object>
 				<real value="1" key="2.IBViewIntegration.shadowOffsetHeight"/>
+				<real value="0.0" key="2.IBViewIntegration.shadowOffsetWidth"/>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">12</int>
+			<int key="maxID">22</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">MPMainWindowController</string>
 					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">usePassword:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">usePassword:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">usePassword:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="contentView">NSView</string>
-						<string key="keyPathControl">NSPathControl</string>
-						<string key="outlineView">NSOutlineView</string>
-						<string key="passwordTextField">NSTextField</string>
-						<string key="passwordView">NSView</string>
+						<string key="outlineView">NSView</string>
+						<string key="splitView">NSSplitView</string>
+						<string key="welcomeText">NSTextField</string>
 						<string key="welcomeView">NSView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -249,22 +242,18 @@
 							<string key="name">contentView</string>
 							<string key="candidateClassName">NSView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="keyPathControl">
-							<string key="name">keyPathControl</string>
-							<string key="candidateClassName">NSPathControl</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="outlineView">
 							<string key="name">outlineView</string>
-							<string key="candidateClassName">NSOutlineView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="passwordTextField">
-							<string key="name">passwordTextField</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="passwordView">
-							<string key="name">passwordView</string>
 							<string key="candidateClassName">NSView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="splitView">
+							<string key="name">splitView</string>
+							<string key="candidateClassName">NSSplitView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="welcomeText">
+							<string key="name">welcomeText</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="welcomeView">
 							<string key="name">welcomeView</string>
 							<string key="candidateClassName">NSView</string>