diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index f9a75edc..52d73aa2 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -13,7 +13,7 @@
 		4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; };
 		4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */; };
 		4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58616CF0FAA00F6806C /* EntryView.xib */; };
-		4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */; };
+		4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPTreeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPTreeTools.m */; };
 		4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */; };
 		4C2E381E16D11FF900037A9D /* 04_KlipperTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381B16D11FF900037A9D /* 04_KlipperTemplate.pdf */; };
 		4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */; };
@@ -32,6 +32,9 @@
 		4C46B88B1706D16E0046109A /* NSData+MPRandomBytes.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88A1706D16E0046109A /* NSData+MPRandomBytes.m */; };
 		4C4A100F176286FD00BBF2CA /* MPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A100E176286FD00BBF2CA /* MPTableView.m */; };
 		4C4A101217629DA900BBF2CA /* KdbGroup+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */; };
+		4C569D9E17652B0600595B62 /* MPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569D9D17652B0600595B62 /* MPConstants.m */; };
+		4C569DA117652BFE00595B62 /* MPEntryTableDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA017652BFE00595B62 /* MPEntryTableDataSource.m */; };
+		4C569DA417653F3500595B62 /* KdbEntry+MPTreeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA317653F3500595B62 /* KdbEntry+MPTreeTools.m */; };
 		4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */; };
 		4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */; };
 		4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */; };
@@ -141,8 +144,8 @@
 		4C22040B1746ED160054C916 /* KdbGroup+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+Undo.h"; sourceTree = "<group>"; };
 		4C22040C1746ED160054C916 /* KdbGroup+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+Undo.m"; sourceTree = "<group>"; };
 		4C25D58616CF0FAA00F6806C /* EntryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EntryView.xib; sourceTree = "<group>"; };
-		4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+MPAdditions.h"; sourceTree = "<group>"; };
-		4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+MPAdditions.m"; sourceTree = "<group>"; };
+		4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPTreeTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+MPTreeTools.h"; sourceTree = "<group>"; };
+		4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPTreeTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+MPTreeTools.m"; sourceTree = "<group>"; };
 		4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 03_ServerTemplate.pdf; sourceTree = "<group>"; };
 		4C2E381B16D11FF900037A9D /* 04_KlipperTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 04_KlipperTemplate.pdf; sourceTree = "<group>"; };
 		4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 05_LanguagesTemplate.pdf; sourceTree = "<group>"; };
@@ -174,6 +177,12 @@
 		4C4A100E176286FD00BBF2CA /* MPTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTableView.m; sourceTree = "<group>"; };
 		4C4A101017629DA900BBF2CA /* KdbGroup+KVOAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+KVOAdditions.h"; sourceTree = "<group>"; };
 		4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+KVOAdditions.m"; sourceTree = "<group>"; };
+		4C569D9C17652AC800595B62 /* MPConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPConstants.h; sourceTree = "<group>"; };
+		4C569D9D17652B0600595B62 /* MPConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPConstants.m; sourceTree = "<group>"; };
+		4C569D9F17652BFE00595B62 /* MPEntryTableDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryTableDataSource.h; sourceTree = "<group>"; };
+		4C569DA017652BFE00595B62 /* MPEntryTableDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEntryTableDataSource.m; sourceTree = "<group>"; };
+		4C569DA217653F3500595B62 /* KdbEntry+MPTreeTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbEntry+MPTreeTools.h"; sourceTree = "<group>"; };
+		4C569DA317653F3500595B62 /* KdbEntry+MPTreeTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbEntry+MPTreeTools.m"; sourceTree = "<group>"; };
 		4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 00_PasswordTemplate.pdf; sourceTree = "<group>"; };
 		4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 01_PackageNetworkTemplate.pdf; sourceTree = "<group>"; };
 		4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 02_MessageBoxWarningTemplate.pdf; sourceTree = "<group>"; };
@@ -411,12 +420,14 @@
 		4C2C4C2516D3BCEA00D49295 /* KeePassLibAdditions */ = {
 			isa = PBXGroup;
 			children = (
-				4C01C23D1764D2980016D5D0 /* KdbEntry+Undo.h */,
-				4C01C23E1764D2980016D5D0 /* KdbEntry+Undo.m */,
-				4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPAdditions.h */,
-				4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */,
+				4C569DA217653F3500595B62 /* KdbEntry+MPTreeTools.h */,
+				4C569DA317653F3500595B62 /* KdbEntry+MPTreeTools.m */,
+				4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPTreeTools.h */,
+				4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPTreeTools.m */,
 				4CC1AEBC16D4467C006D2AAB /* KdbTree+MPAdditions.h */,
 				4CC1AEBD16D4467C006D2AAB /* KdbTree+MPAdditions.m */,
+				4C01C23D1764D2980016D5D0 /* KdbEntry+Undo.h */,
+				4C01C23E1764D2980016D5D0 /* KdbEntry+Undo.m */,
 				4C22040B1746ED160054C916 /* KdbGroup+Undo.h */,
 				4C22040C1746ED160054C916 /* KdbGroup+Undo.m */,
 				4C4A101017629DA900BBF2CA /* KdbGroup+KVOAdditions.h */,
@@ -438,6 +449,8 @@
 				4C5BF67A175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m */,
 				4C01C2401764D8980016D5D0 /* MPContextMenuHelper.h */,
 				4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */,
+				4C569D9C17652AC800595B62 /* MPConstants.h */,
+				4C569D9D17652B0600595B62 /* MPConstants.m */,
 			);
 			name = Helper;
 			sourceTree = "<group>";
@@ -462,6 +475,8 @@
 			children = (
 				4C37A83E15B8B474005EF8EE /* MPOutlineDataSource.h */,
 				4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */,
+				4C569D9F17652BFE00595B62 /* MPEntryTableDataSource.h */,
+				4C569DA017652BFE00595B62 /* MPEntryTableDataSource.m */,
 				6E719715172058BA00E4C5FC /* MPDatabaseVersion.h */,
 				4CE5B548173AFBA700207B39 /* MPDocument.h */,
 				4CE5B549173AFBA700207B39 /* MPDocument.m */,
@@ -1001,7 +1016,7 @@
 				4CDF01A316D1B76700D0AC08 /* MPEntryViewController.m in Sources */,
 				4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */,
 				4C61EA0316D2FD0800AC519E /* MPOutlineViewController.m in Sources */,
-				4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPAdditions.m in Sources */,
+				4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPTreeTools.m in Sources */,
 				4CC1AEBE16D4467C006D2AAB /* KdbTree+MPAdditions.m in Sources */,
 				4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */,
 				4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */,
@@ -1036,6 +1051,9 @@
 				4C01C23F1764D2980016D5D0 /* KdbEntry+Undo.m in Sources */,
 				4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */,
 				4C01C245176500C40016D5D0 /* HNHLevelIndicatorCell.m in Sources */,
+				4C569D9E17652B0600595B62 /* MPConstants.m in Sources */,
+				4C569DA117652BFE00595B62 /* MPEntryTableDataSource.m in Sources */,
+				4C569DA417653F3500595B62 /* KdbEntry+MPTreeTools.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 402b7847..b28b5790 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -12,8 +12,6 @@
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBNSLayoutConstraint</string>
-			<string>NSButton</string>
-			<string>NSButtonCell</string>
 			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
 			<string>NSImageCell</string>
@@ -46,7 +44,7 @@
 					<object class="NSTextField" id="524369596">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{40, 417}, {35, 14}}</string>
+						<string key="NSFrame">{{40, 372}, {35, 14}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="290763686"/>
@@ -87,7 +85,7 @@
 					<object class="NSTextField" id="290763686">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{80, 413}, {164, 22}}</string>
+						<string key="NSFrame">{{80, 368}, {124, 22}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="582897606"/>
@@ -129,7 +127,7 @@
 					<object class="NSTextField" id="582897606">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{17, 385}, {58, 14}}</string>
+						<string key="NSFrame">{{17, 340}, {58, 14}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="38182485"/>
@@ -150,7 +148,7 @@
 					<object class="NSTextField" id="38182485">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{80, 381}, {164, 22}}</string>
+						<string key="NSFrame">{{80, 336}, {124, 22}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="738135925"/>
@@ -172,7 +170,7 @@
 					<object class="NSTextField" id="681190446">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{80, 349}, {164, 22}}</string>
+						<string key="NSFrame">{{80, 304}, {124, 22}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="333573736"/>
@@ -194,7 +192,7 @@
 					<object class="NSTextField" id="738135925">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{50, 353}, {25, 14}}</string>
+						<string key="NSFrame">{{50, 308}, {25, 14}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="681190446"/>
@@ -215,7 +213,7 @@
 					<object class="NSTextField" id="333573736">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{20, 292}, {55, 14}}</string>
+						<string key="NSFrame">{{20, 247}, {55, 14}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="438007584"/>
@@ -233,34 +231,6 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSButton" id="782711985">
-						<reference key="NSNextResponder" ref="87082330"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{212, 286}, {32, 25}}</string>
-						<reference key="NSSuperview" ref="87082330"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:22</string>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="353877023">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">134217728</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="308723166"/>
-							<string key="NSCellIdentifier">_NS:22</string>
-							<reference key="NSControlView" ref="782711985"/>
-							<int key="NSButtonFlags">-1228652544</int>
-							<int key="NSButtonFlags2">163</int>
-							<object class="NSCustomResource" key="NSNormalImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSRefreshTemplate</string>
-							</object>
-							<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="NSImageView" id="1013751338">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
@@ -272,7 +242,7 @@
 							<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
 							<string>NeXT TIFF v4.0 pasteboard type</string>
 						</set>
-						<string key="NSFrame">{{20, 464}, {48, 48}}</string>
+						<string key="NSFrame">{{20, 419}, {48, 48}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="787130496"/>
@@ -297,7 +267,7 @@
 					<object class="NSTextField" id="787130496">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{73, 480}, {136, 17}}</string>
+						<string key="NSFrame">{{73, 435}, {134, 17}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="152677463"/>
@@ -324,7 +294,7 @@
 					<object class="NSCustomView" id="152677463">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{20, 454}, {224, 2}}</string>
+						<string key="NSFrame">{{20, 409}, {184, 2}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="524369596"/>
@@ -334,10 +304,10 @@
 					<object class="NSTextField" id="438007584">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{80, 288}, {124, 22}}</string>
+						<string key="NSFrame">{{80, 243}, {124, 22}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="782711985"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="11759019">
@@ -354,7 +324,7 @@
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{264, 532}</string>
+				<string key="NSFrameSize">{224, 487}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1013751338"/>
@@ -379,14 +349,6 @@
 					</object>
 					<int key="connectionID">112</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">showPasswordCreator</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="782711985"/>
-					</object>
-					<int key="connectionID">520</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">titleOrNameLabel</string>
@@ -466,27 +428,11 @@
 						<int key="objectID">455</int>
 						<reference key="object" ref="87082330"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="7482984">
-								<reference key="firstItem" ref="782711985"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="438007584"/>
-								<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="87082330"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="246479646">
 								<reference key="firstItem" ref="87082330"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="782711985"/>
+								<reference key="secondItem" ref="438007584"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -514,22 +460,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="731653499">
-								<reference key="firstItem" ref="438007584"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="782711985"/>
-								<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="87082330"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="392529850">
 								<reference key="firstItem" ref="438007584"/>
 								<int key="firstAttribute">5</int>
@@ -578,6 +508,22 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="932354730">
+								<reference key="firstItem" ref="681190446"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="38182485"/>
+								<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="87082330"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="378589016">
 								<reference key="firstItem" ref="87082330"/>
 								<int key="firstAttribute">6</int>
@@ -610,22 +556,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="616882301">
-								<reference key="firstItem" ref="681190446"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="38182485"/>
-								<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="87082330"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="342428824">
 								<reference key="firstItem" ref="681190446"/>
 								<int key="firstAttribute">3</int>
@@ -818,6 +748,22 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="579522466">
+								<reference key="firstItem" ref="87082330"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="787130496"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="87082330"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="26781143">
 								<reference key="firstItem" ref="787130496"/>
 								<int key="firstAttribute">10</int>
@@ -898,7 +844,7 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="92603861">
+							<object class="IBNSLayoutConstraint" id="1058743908">
 								<reference key="firstItem" ref="1013751338"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
@@ -910,11 +856,11 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="87082330"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="567664737">
+							<object class="IBNSLayoutConstraint" id="222939184">
 								<reference key="firstItem" ref="1013751338"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -926,8 +872,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="87082330"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
 							<reference ref="1013751338"/>
@@ -935,7 +881,6 @@
 							<reference ref="290763686"/>
 							<reference ref="38182485"/>
 							<reference ref="681190446"/>
-							<reference ref="782711985"/>
 							<reference ref="152677463"/>
 							<reference ref="582897606"/>
 							<reference ref="524369596"/>
@@ -945,178 +890,13 @@
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">493</int>
-						<reference key="object" ref="246479646"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">479</int>
-						<reference key="object" ref="876688849"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">478</int>
-						<reference key="object" ref="616882301"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">477</int>
-						<reference key="object" ref="342428824"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">475</int>
-						<reference key="object" ref="55766908"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">474</int>
-						<reference key="object" ref="758576082"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">473</int>
-						<reference key="object" ref="843374725"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">472</int>
-						<reference key="object" ref="142848239"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">471</int>
-						<reference key="object" ref="709249080"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">466</int>
-						<reference key="object" ref="524369596"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="98576073"/>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">465</int>
-						<reference key="object" ref="290763686"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="376184997"/>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">464</int>
-						<reference key="object" ref="38182485"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="787288894"/>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">463</int>
-						<reference key="object" ref="582897606"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="836710998"/>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">462</int>
-						<reference key="object" ref="681190446"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="342663601"/>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">461</int>
-						<reference key="object" ref="738135925"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="394735517"/>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">459</int>
-						<reference key="object" ref="333573736"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="495340064"/>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">457</int>
-						<reference key="object" ref="782711985"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="353877023"/>
-							<object class="IBNSLayoutConstraint" id="749563412">
-								<reference key="firstItem" ref="782711985"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">32</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="782711985"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">505</int>
-						<reference key="object" ref="353877023"/>
-						<reference key="parent" ref="782711985"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">502</int>
-						<reference key="object" ref="495340064"/>
-						<reference key="parent" ref="333573736"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">500</int>
-						<reference key="object" ref="394735517"/>
-						<reference key="parent" ref="738135925"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">499</int>
-						<reference key="object" ref="342663601"/>
-						<reference key="parent" ref="681190446"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">498</int>
-						<reference key="object" ref="836710998"/>
-						<reference key="parent" ref="582897606"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">497</int>
-						<reference key="object" ref="787288894"/>
-						<reference key="parent" ref="38182485"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">496</int>
-						<reference key="object" ref="376184997"/>
-						<reference key="parent" ref="290763686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">495</int>
-						<reference key="object" ref="98576073"/>
-						<reference key="parent" ref="524369596"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">62</int>
 						<reference key="object" ref="1013751338"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="158181239">
+							<object class="IBNSLayoutConstraint" id="994800936">
 								<reference key="firstItem" ref="1013751338"/>
-								<int key="firstAttribute">8</int>
+								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
 								<int key="secondAttribute">0</int>
@@ -1130,9 +910,9 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="12312109">
+							<object class="IBNSLayoutConstraint" id="158181239">
 								<reference key="firstItem" ref="1013751338"/>
-								<int key="firstAttribute">7</int>
+								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
 								<int key="secondAttribute">0</int>
@@ -1151,14 +931,14 @@
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">109</int>
-						<reference key="object" ref="158181239"/>
-						<reference key="parent" ref="1013751338"/>
+						<int key="objectID">651</int>
+						<reference key="object" ref="1058743908"/>
+						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">110</int>
-						<reference key="object" ref="12312109"/>
-						<reference key="parent" ref="1013751338"/>
+						<int key="objectID">650</int>
+						<reference key="object" ref="222939184"/>
+						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">63</int>
@@ -1166,63 +946,9 @@
 						<reference key="parent" ref="1013751338"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">514</int>
-						<reference key="object" ref="567664737"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">515</int>
-						<reference key="object" ref="92603861"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100</int>
-						<reference key="object" ref="787130496"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="790131230"/>
-							<object class="IBNSLayoutConstraint" id="889842001">
-								<reference key="firstItem" ref="787130496"/>
-								<int key="firstAttribute">7</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">130</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="787130496"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">101</int>
-						<reference key="object" ref="790131230"/>
-						<reference key="parent" ref="787130496"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">516</int>
-						<reference key="object" ref="408064385"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">517</int>
-						<reference key="object" ref="26781143"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">526</int>
-						<reference key="object" ref="93779078"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">529</int>
-						<reference key="object" ref="889842001"/>
-						<reference key="parent" ref="787130496"/>
+						<int key="objectID">109</int>
+						<reference key="object" ref="158181239"/>
+						<reference key="parent" ref="1013751338"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">530</int>
@@ -1247,6 +973,16 @@
 						</array>
 						<reference key="parent" ref="87082330"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">547</int>
+						<reference key="object" ref="858265590"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="899015952"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">540</int>
 						<reference key="object" ref="850299237"/>
@@ -1258,33 +994,24 @@
 						<reference key="parent" ref="152677463"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">544</int>
-						<reference key="object" ref="899015952"/>
+						<int key="objectID">461</int>
+						<reference key="object" ref="738135925"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="394735517"/>
+						</array>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">547</int>
-						<reference key="object" ref="858265590"/>
-						<reference key="parent" ref="87082330"/>
+						<int key="objectID">500</int>
+						<reference key="object" ref="394735517"/>
+						<reference key="parent" ref="738135925"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">556</int>
-						<reference key="object" ref="118513034"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">557</int>
-						<reference key="object" ref="254702395"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">558</int>
-						<reference key="object" ref="316000419"/>
-						<reference key="parent" ref="87082330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">559</int>
-						<reference key="object" ref="560564035"/>
+						<int key="objectID">463</int>
+						<reference key="object" ref="582897606"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="836710998"/>
+						</array>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1293,15 +1020,132 @@
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">629</int>
-						<reference key="object" ref="749563412"/>
-						<reference key="parent" ref="782711985"/>
+						<int key="objectID">498</int>
+						<reference key="object" ref="836710998"/>
+						<reference key="parent" ref="582897606"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">466</int>
+						<reference key="object" ref="524369596"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="98576073"/>
+						</array>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">495</int>
+						<reference key="object" ref="98576073"/>
+						<reference key="parent" ref="524369596"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">465</int>
+						<reference key="object" ref="290763686"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="376184997"/>
+						</array>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">556</int>
+						<reference key="object" ref="118513034"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">526</int>
+						<reference key="object" ref="93779078"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">471</int>
+						<reference key="object" ref="709249080"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">558</int>
+						<reference key="object" ref="316000419"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">496</int>
+						<reference key="object" ref="376184997"/>
+						<reference key="parent" ref="290763686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">464</int>
+						<reference key="object" ref="38182485"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="787288894"/>
+						</array>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">475</int>
+						<reference key="object" ref="55766908"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">474</int>
+						<reference key="object" ref="758576082"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">473</int>
+						<reference key="object" ref="843374725"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">472</int>
+						<reference key="object" ref="142848239"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">557</int>
+						<reference key="object" ref="254702395"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">497</int>
+						<reference key="object" ref="787288894"/>
+						<reference key="parent" ref="38182485"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">462</int>
+						<reference key="object" ref="681190446"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="342663601"/>
+						</array>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">652</int>
+						<reference key="object" ref="932354730"/>
+						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">631</int>
 						<reference key="object" ref="378589016"/>
 						<reference key="parent" ref="87082330"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">479</int>
+						<reference key="object" ref="876688849"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">477</int>
+						<reference key="object" ref="342428824"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">559</int>
+						<reference key="object" ref="560564035"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">499</int>
+						<reference key="object" ref="342663601"/>
+						<reference key="parent" ref="681190446"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">635</int>
 						<reference key="object" ref="438007584"/>
@@ -1311,13 +1155,8 @@
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">636</int>
-						<reference key="object" ref="11759019"/>
-						<reference key="parent" ref="438007584"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">638</int>
-						<reference key="object" ref="1047354211"/>
+						<int key="objectID">646</int>
+						<reference key="object" ref="246479646"/>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1326,13 +1165,21 @@
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">640</int>
-						<reference key="object" ref="392529850"/>
+						<int key="objectID">638</int>
+						<reference key="object" ref="1047354211"/>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">641</int>
-						<reference key="object" ref="731653499"/>
+						<int key="objectID">636</int>
+						<reference key="object" ref="11759019"/>
+						<reference key="parent" ref="438007584"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">459</int>
+						<reference key="object" ref="333573736"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="495340064"/>
+						</array>
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1341,32 +1188,67 @@
 						<reference key="parent" ref="87082330"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">643</int>
-						<reference key="object" ref="7482984"/>
+						<int key="objectID">640</int>
+						<reference key="object" ref="392529850"/>
 						<reference key="parent" ref="87082330"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">502</int>
+						<reference key="object" ref="495340064"/>
+						<reference key="parent" ref="333573736"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100</int>
+						<reference key="object" ref="787130496"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="790131230"/>
+						</array>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">648</int>
+						<reference key="object" ref="579522466"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">517</int>
+						<reference key="object" ref="26781143"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">516</int>
+						<reference key="object" ref="408064385"/>
+						<reference key="parent" ref="87082330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">101</int>
+						<reference key="object" ref="790131230"/>
+						<reference key="parent" ref="787130496"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">661</int>
+						<reference key="object" ref="994800936"/>
+						<reference key="parent" ref="1013751338"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<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 key="100.IBNSViewMetadataConstraints">
-					<reference ref="889842001"/>
-				</array>
 				<boolean value="NO" key="100.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="100.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="109.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="110.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="455.IBNSViewMetadataConstraints">
-					<reference ref="567664737"/>
-					<reference ref="92603861"/>
+				<array class="NSMutableArray" key="455.IBNSViewMetadataConstraints">
+					<reference ref="222939184"/>
+					<reference ref="1058743908"/>
 					<reference ref="850299237"/>
 					<reference ref="899015952"/>
 					<reference ref="858265590"/>
 					<reference ref="408064385"/>
 					<reference ref="26781143"/>
+					<reference ref="579522466"/>
 					<reference ref="316000419"/>
 					<reference ref="709249080"/>
 					<reference ref="93779078"/>
@@ -1379,25 +1261,18 @@
 					<reference ref="55766908"/>
 					<reference ref="560564035"/>
 					<reference ref="342428824"/>
-					<reference ref="616882301"/>
 					<reference ref="876688849"/>
 					<reference ref="378589016"/>
+					<reference ref="932354730"/>
 					<reference ref="1047354211"/>
 					<reference ref="938968096"/>
 					<reference ref="392529850"/>
-					<reference ref="731653499"/>
 					<reference ref="522224579"/>
 					<reference ref="246479646"/>
-					<reference ref="7482984"/>
 				</array>
 				<boolean value="NO" key="455.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
 				<boolean value="NO" key="455.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="457.IBNSViewMetadataConstraints">
-					<reference ref="749563412"/>
-				</array>
-				<boolean value="NO" key="457.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="459.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="461.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1418,9 +1293,7 @@
 				<string key="474.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="475.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="493.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="495.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="496.CustomClassName">HNHRoundedTextFieldCell</string>
 				<string key="496.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1431,13 +1304,9 @@
 				<string key="499.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="500.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="502.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="505.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="514.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="515.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="516.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="529.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="530.IBNSViewMetadataConstraints">
 					<reference ref="130327018"/>
 				</array>
@@ -1453,13 +1322,12 @@
 				<string key="559.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="565.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="62.CustomClassName">MPPopupImageView</string>
-				<array class="NSMutableArray" key="62.IBNSViewMetadataConstraints">
+				<array key="62.IBNSViewMetadataConstraints">
 					<reference ref="158181239"/>
-					<reference ref="12312109"/>
+					<reference ref="994800936"/>
 				</array>
 				<boolean value="NO" key="62.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="629.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="631.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="635.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1469,15 +1337,19 @@
 				<string key="638.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="639.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="640.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="641.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="642.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="643.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="646.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="648.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="650.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="651.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="661.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">644</int>
+			<int key="maxID">661</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1592,10 +1464,10 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSApplicationIcon">{128, 128}</string>
-			<string key="NSRefreshTemplate">{10, 12}</string>
-		</dictionary>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSApplicationIcon</string>
+			<string key="NS.object.0">{128, 128}</string>
+		</object>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index 607d6ed0..0c0cd5c1 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -1502,17 +1502,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">MPEntryViewController</string>
 					<string key="superclassName">MPViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">_toggleFilterSpace:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">_toggleFilterSpace:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">_toggleFilterSpace:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="entryTable">NSTableView</string>
 						<string key="filterBar">NSView</string>
@@ -1522,7 +1511,6 @@
 						<string key="filterTitleButton">NSButton</string>
 						<string key="filterURLButton">NSButton</string>
 						<string key="filterUsernameButton">NSButton</string>
-						<string key="tableToBottom">NSLayoutConstraint</string>
 						<string key="tableToTop">NSLayoutConstraint</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1558,10 +1546,6 @@
 							<string key="name">filterUsernameButton</string>
 							<string key="candidateClassName">NSButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="tableToBottom">
-							<string key="name">tableToBottom</string>
-							<string key="candidateClassName">NSLayoutConstraint</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="tableToTop">
 							<string key="name">tableToTop</string>
 							<string key="candidateClassName">NSLayoutConstraint</string>
diff --git a/MacPass/KdbEntry+MPTreeTools.h b/MacPass/KdbEntry+MPTreeTools.h
new file mode 100644
index 00000000..7788cbc1
--- /dev/null
+++ b/MacPass/KdbEntry+MPTreeTools.h
@@ -0,0 +1,15 @@
+//
+//  KdbEntry+MPTreeTools.h
+//  MacPass
+//
+//  Created by Michael Starke on 10.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb.h"
+
+@interface KdbEntry (MPTreeTools)
+
+- (NSUInteger)indexInParent;
+
+@end
diff --git a/MacPass/KdbEntry+MPTreeTools.m b/MacPass/KdbEntry+MPTreeTools.m
new file mode 100644
index 00000000..0b7c6642
--- /dev/null
+++ b/MacPass/KdbEntry+MPTreeTools.m
@@ -0,0 +1,20 @@
+//
+//  KdbEntry+MPTreeTools.m
+//  MacPass
+//
+//  Created by Michael Starke on 10.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "KdbEntry+MPTreeTools.h"
+
+@implementation KdbEntry (MPTreeTools)
+
+- (NSUInteger)indexInParent {
+  if(self.parent) {
+    return [self.parent.entries indexOfObject:self];
+  }
+  return NSNotFound;
+}
+
+@end
diff --git a/MacPass/KdbEntry+Undo.m b/MacPass/KdbEntry+Undo.m
index 108f61b1..dda22d8d 100644
--- a/MacPass/KdbEntry+Undo.m
+++ b/MacPass/KdbEntry+Undo.m
@@ -7,7 +7,7 @@
 //
 
 #import "KdbEntry+Undo.h"
-#import "KdbGroup+MPAdditions.h"
+#import "KdbGroup+MPTreeTools.h"
 
 NSString *const MPEntryTitleUndoableKey = @"titleUndoable";
 NSString *const MPEntryUsernameUndoableKey = @"usernameUndoable";
diff --git a/MacPass/KdbGroup+MPAdditions.h b/MacPass/KdbGroup+MPAdditions.h
deleted file mode 100644
index 250b93cd..00000000
--- a/MacPass/KdbGroup+MPAdditions.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  KdbGroup+MPAdditions.h
-//  MacPass
-//
-//  Created by michael starke on 19.02.13.
-//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import "KdbLib.h"
-
-@interface KdbGroup (MPAdditions)
-
-- (NSArray *)childGroups;
-
-- (NSArray *)childEntries;
-
-- (void)moveEntry:(KdbEntry *)entry toIndex:(NSUInteger)index;
-
-@end
\ No newline at end of file
diff --git a/MacPass/KdbGroup+MPTreeTools.h b/MacPass/KdbGroup+MPTreeTools.h
new file mode 100644
index 00000000..5b64b4a2
--- /dev/null
+++ b/MacPass/KdbGroup+MPTreeTools.h
@@ -0,0 +1,21 @@
+//
+//  KdbGroup+MPTreeTools.h
+//  MacPass
+//
+//  Created by michael starke on 19.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb.h"
+@class UUID;
+
+@interface KdbGroup (MPTreeTools)
+
+/* Returns all groups under this group and it's subgroups */
+- (NSArray *)childGroups;
+/* Returns all entries under this group and it's subgroups */
+- (NSArray *)childEntries;
+
+- (KdbEntry *)entryForUUID:(UUID *)uuid;
+
+@end
\ No newline at end of file
diff --git a/MacPass/KdbGroup+MPAdditions.m b/MacPass/KdbGroup+MPTreeTools.m
similarity index 59%
rename from MacPass/KdbGroup+MPAdditions.m
rename to MacPass/KdbGroup+MPTreeTools.m
index b6924616..157e174c 100644
--- a/MacPass/KdbGroup+MPAdditions.m
+++ b/MacPass/KdbGroup+MPTreeTools.m
@@ -1,14 +1,16 @@
 //
-//  KdbGroup+MPAdditions.m
+//  KdbGroup+MPTreeTools.m
 //  MacPass
 //
 //  Created by michael starke on 19.02.13.
 //  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
 //
 
-#import "KdbGroup+MPAdditions.h"
+#import "KdbGroup+MPTreeTools.h"
+#import "Kdb4Node.h"
+#import "Kdb3Node.h"
 
-@implementation KdbGroup (MPAdditions)
+@implementation KdbGroup (MPTreeTools)
 
 - (NSArray *)childGroups {
   NSMutableArray *childGroups = [NSMutableArray arrayWithCapacity:[self.groups count]];
@@ -27,15 +29,11 @@
   return childEntries;
 }
 
-- (void)moveEntry:(KdbEntry *)entry toIndex:(NSUInteger)index {
-  if([entries count] > index) {
-    return;
-  }
-  NSUInteger oldIndex = [entries indexOfObject:entry];
-  if(oldIndex == NSNotFound) {
-    return;
-  }
-  [entries exchangeObjectAtIndex:oldIndex withObjectAtIndex:index];
+- (KdbEntry *)entryForUUID:(UUID *)uuid {
+  NSArray *childEntries = [self childEntries];
+  NSArray *filterdEntries = [childEntries filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
+    return [uuid isEqual:(UUID *)[evaluatedObject uuid]];
+  }]];
+  return [filterdEntries lastObject];
 }
-
 @end
\ No newline at end of file
diff --git a/MacPass/KdbTree+MPAdditions.m b/MacPass/KdbTree+MPAdditions.m
index efa0e35a..dd7b1fbf 100644
--- a/MacPass/KdbTree+MPAdditions.m
+++ b/MacPass/KdbTree+MPAdditions.m
@@ -7,7 +7,7 @@
 //
 
 #import "KdbTree+MPAdditions.h"
-#import "KdbGroup+MPAdditions.h"
+#import "KdbGroup+MPTreeTools.h"
 
 @implementation KdbTree (MPAdditions)
 
diff --git a/MacPass/MPConstants.h b/MacPass/MPConstants.h
new file mode 100644
index 00000000..69c418ab
--- /dev/null
+++ b/MacPass/MPConstants.h
@@ -0,0 +1,16 @@
+//
+//  MPConstants.h
+//  MacPass
+//
+//  Created by Michael Starke on 09.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#ifndef MacPass_MPConstants_h
+#define MacPass_MPConstants_h
+
+#import <Foundation/Foundation.h>
+
+FOUNDATION_EXPORT NSString *const MPPasteBoardType;
+
+#endif
diff --git a/MacPass/MPConstants.m b/MacPass/MPConstants.m
new file mode 100644
index 00000000..a4c3e061
--- /dev/null
+++ b/MacPass/MPConstants.m
@@ -0,0 +1,11 @@
+//
+//  MPConstants.m
+//  MacPass
+//
+//  Created by Michael Starke on 09.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPConstants.h"
+
+NSString *const MPPasteBoardType = @"com.hicknhack.macpass.pasteboard";
diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h
index daa6e05c..72c6062f 100644
--- a/MacPass/MPDocument.h
+++ b/MacPass/MPDocument.h
@@ -43,4 +43,6 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 - (void)moveGroup:(KdbGroup *)group toGroup:(KdbGroup *)target index:(NSInteger)index;
 - (BOOL)group:(KdbGroup *)group isMoveableToGroup:(KdbGroup *)target;
 
+- (void)moveEntry:(KdbEntry *)entry toGroup:(KdbGroup *)target index:(NSInteger)index;
+
 @end
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 67ffc746..676b561b 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -184,4 +184,19 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey";
   }
   return isMovable;
 }
+
+- (void)moveEntry:(KdbEntry *)entry toGroup:(KdbGroup *)target index:(NSInteger)index {
+  NSInteger oldIndex = [entry.parent.entries indexOfObject:entry];
+  if(entry.parent == target && oldIndex == index) {
+    return; // No changes
+  }
+  [[[self undoManager] prepareWithInvocationTarget:self] moveEntry:entry toGroup:entry.parent index:oldIndex];
+  [[self undoManager] setActionName:@"MOVE_ENTRY"];
+  [entry.parent removeObjectFromEntriesAtIndex:oldIndex];
+  if(index < 0 || index > [target.groups count] ) {
+    index = [target.groups count];
+  }
+  [target insertObject:entry inEntriesAtIndex:index];
+}
+
 @end
diff --git a/MacPass/MPDocumentWindowController.h b/MacPass/MPDocumentWindowController.h
index f8e44d1c..c61f1f2a 100644
--- a/MacPass/MPDocumentWindowController.h
+++ b/MacPass/MPDocumentWindowController.h
@@ -17,7 +17,10 @@
 @class MPCreationViewController;
 
 
-@interface MPDocumentWindowController : NSWindowController
+@interface MPDocumentWindowController : NSWindowController <NSSplitViewDelegate> {
+@private
+  NSArray *_inspectorContraints;
+}
 
 @property (readonly, retain) MPPasswordInputController *passwordInputController;
 @property (readonly, retain) MPPasswordEditViewController *passwordEditController;
@@ -34,4 +37,6 @@
 - (IBAction)editPassword:(id)sender;
 - (void)lock:(id)sender;
 
+- (void)toggleInspector:(id)sender;
+
 @end
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 31b1888b..e9d6a996 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -34,8 +34,6 @@
 
 @property (retain) MPToolbarDelegate *toolbarDelegate;
 
-- (void)_setContentViewController:(MPViewController *)viewController;
-
 @end
 
 @implementation MPDocumentWindowController
@@ -69,7 +67,6 @@
 }
 
 #pragma mark View Handling
-
 - (void)windowDidLoad
 {
   [super windowDidLoad];
@@ -90,7 +87,8 @@
   [_splitView setHoldingPriority:NSLayoutPriorityDefaultLow+2 forSubviewAtIndex:0];
   [_splitView setHoldingPriority:NSLayoutPriorityDefaultLow+1 forSubviewAtIndex:2];
   
-  //TODO: Fix setup on start
+  [_splitView setDelegate:self];
+  
   MPDocument *document = [self document];
   if(!document.isDecrypted) {
     [self showPasswordInput];
@@ -100,6 +98,10 @@
   }
 }
 
+- (BOOL)splitView:(NSSplitView *)splitView shouldHideDividerAtIndex:(NSInteger)dividerIndex {
+  return NO;
+}
+
 - (void)_setContentViewController:(MPViewController *)viewController {
   
   NSView *newContentView = nil;
@@ -172,6 +174,10 @@
   [self showPasswordInput];
 }
 
+- (void)toggleInspector:(id)sender {
+
+}
+
 - (void)showEntries {
   NSView *contentView = [[self window] contentView];
   if(_splitView == contentView) {
diff --git a/MacPass/MPEntryTableDataSource.h b/MacPass/MPEntryTableDataSource.h
new file mode 100644
index 00000000..817c814c
--- /dev/null
+++ b/MacPass/MPEntryTableDataSource.h
@@ -0,0 +1,16 @@
+//
+//  MPEntyTableDataSource.h
+//  MacPass
+//
+//  Created by Michael Starke on 09.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class MPEntryViewController;
+@interface MPEntryTableDataSource : NSObject <NSTableViewDataSource>
+
+@property (assign, nonatomic) MPEntryViewController *viewController;
+
+@end
diff --git a/MacPass/MPEntryTableDataSource.m b/MacPass/MPEntryTableDataSource.m
new file mode 100644
index 00000000..09ed6610
--- /dev/null
+++ b/MacPass/MPEntryTableDataSource.m
@@ -0,0 +1,42 @@
+//
+//  MPEntyTableDataSource.m
+//  MacPass
+//
+//  Created by Michael Starke on 09.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPEntryTableDataSource.h"
+#import "MPEntryViewController.h"
+#import "UUID.h"
+#import "MPConstants.h"
+
+@interface MPEntryTableDataSource ()
+
+@end
+
+@implementation MPEntryTableDataSource
+
+- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard {
+  
+  if([rowIndexes count] != 1) {
+    return NO; // No valid drag
+  }
+  
+  id entry = [self.viewController.entryArrayController arrangedObjects][[rowIndexes firstIndex]];
+  
+  if(![entry respondsToSelector:@selector(uuid)]) {
+    return NO; // Invalid item for dragging
+  }
+  UUID *uuid = (UUID *)[entry uuid];
+  NSPasteboardItem *pBoardItem = [[NSPasteboardItem alloc] init];
+  [pBoardItem setString:[uuid description] forType:MPPasteBoardType];
+  [pboard writeObjects:@[pBoardItem]];
+  [pBoardItem release];
+  
+  return YES;
+}
+
+//TODO: Validation and adding
+
+@end
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 78b307e3..4b1caf04 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -15,10 +15,12 @@
 #import "MPDocumentWindowController.h"
 #import "MPPasteBoardController.h"
 #import "MPOverlayWindowController.h"
-#import "KdbGroup+MPAdditions.h"
+#import "KdbGroup+MPTreeTools.h"
 #import "KdbGroup+Undo.h"
 #import "KdbEntry+Undo.h"
 #import "MPContextMenuHelper.h"
+#import "MPConstants.h"
+#import "MPEntryTableDataSource.h"
 
 NSString *const MPDidChangeSelectedEntryNotification = @"com.macpass.MPDidChangeSelectedEntryNotification";
 
@@ -68,6 +70,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
 @property (assign) KdbEntry *selectedEntry;
 
+@property (nonatomic, retain) MPEntryTableDataSource *dataSource;
 
 @property (assign, nonatomic) MPFilterModeType filterMode;
 @property (retain, nonatomic) NSDictionary *filterButtonToMode;
@@ -90,6 +93,8 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
                            _toggleFilterURLButton : @(MPFilterUrls)
                            } retain];
     _entryArrayController = [[NSArrayController alloc] init];
+    _dataSource = [[MPEntryTableDataSource alloc] init];
+    _dataSource.viewController = self;
     _selectedEntry = nil;    
   }
   return self;
@@ -103,6 +108,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   self.filterBar = nil;
   self.tableToTop = nil;
   self.filterButtonToMode = nil;
+  self.dataSource = nil;
   [super dealloc];
 }
 
@@ -120,6 +126,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   [self.entryTable setDoubleAction:@selector(_columnDoubleClick:)];
   [self.entryTable setTarget:self];
   [self.entryTable setFloatsGroupRows:NO];
+  [self.entryTable registerForDraggedTypes:@[MPPasteBoardType]];
   [self _setupEntryMenu];
   
   NSTableColumn *parentColumn = [self.entryTable tableColumns][0];
@@ -150,6 +157,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   
   [self.entryTable bind:NSContentBinding toObject:self.entryArrayController withKeyPath:@"arrangedObjects" options:nil];
   [self.entryTable bind:NSSortDescriptorsBinding toObject:self.entryArrayController withKeyPath:@"sortDescriptors" options:nil];
+  [self.entryTable setDataSource:_dataSource];
 
   [parentColumn setHidden:YES];
 }
@@ -197,7 +205,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification *)notification {
-  if([self.entryTable selectedRow] < 0) {
+  if([self.entryTable selectedRow] < 0 || [[_entryTable selectedRowIndexes] count] > 1) {
     self.selectedEntry = nil;
   }
   else {
diff --git a/MacPass/MPGeneralSettingsController.m b/MacPass/MPGeneralSettingsController.m
index a06f80a3..88fbb072 100644
--- a/MacPass/MPGeneralSettingsController.m
+++ b/MacPass/MPGeneralSettingsController.m
@@ -11,12 +11,6 @@
 
 NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
 
-@interface MPGeneralSettingsController ()
-
-- (void)didLoadView;
-
-@end
-
 @implementation MPGeneralSettingsController
 
 + (NSString *)identifier {
diff --git a/MacPass/MPOutlineDataSource.h b/MacPass/MPOutlineDataSource.h
index 6938abe4..abd4252e 100644
--- a/MacPass/MPOutlineDataSource.h
+++ b/MacPass/MPOutlineDataSource.h
@@ -8,8 +8,6 @@
 
 #import <Foundation/Foundation.h>
 
-APPKIT_EXTERN NSString *const MPPasteBoardType;
-
 @class KdbGroup;
 
 @interface MPOutlineDataSource : NSObject <NSOutlineViewDataSource> {
diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m
index 4ddf0a4e..f83edad0 100644
--- a/MacPass/MPOutlineDataSource.m
+++ b/MacPass/MPOutlineDataSource.m
@@ -10,8 +10,10 @@
 #import "MPDocument.h"
 #import "KdbLib.h"
 #import "KdbGroup+Undo.h"
-
-NSString *const MPPasteBoardType = @"com.hicknhack.macpass.pasteboard";
+#import "KdbGroup+MPTreeTools.h"
+#import "KdbEntry+MPTreeTools.h"
+#import "MPConstants.h"
+#import "UUID.h"
 
 @implementation MPOutlineDataSource
 
@@ -43,23 +45,48 @@ NSString *const MPPasteBoardType = @"com.hicknhack.macpass.pasteboard";
       return NSDragOperationMove;
     }
   }
+  NSPasteboard *pasteBoard = [info draggingPasteboard];
+  NSArray *items = [pasteBoard pasteboardItems];
+  if([items count] > 0) {
+    if( index != NSOutlineViewDropOnItemIndex ) {
+      [outlineView setDropItem:item dropChildIndex:NSOutlineViewDropOnItemIndex];
+    }
+    return NSDragOperationMove;
+  }
   return NSDragOperationNone;
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id<NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index {
-  NSLog(@"Drag %@ to: %@ index: %ld", _draggedItem, [item representedObject], index);
   KdbGroup *target = [item representedObject];
-  BOOL accepted = YES;
-  if( _draggedItem.parent == target ) {
-    accepted &= index != NSOutlineViewDropOnItemIndex;
-    accepted &= index != [_draggedItem.parent.groups indexOfObject:_draggedItem];
+  if(_draggedItem) {
+    BOOL accepted = YES;
+    if( _draggedItem.parent == target ) {
+      accepted &= index != NSOutlineViewDropOnItemIndex;
+      accepted &= index != [_draggedItem.parent.groups indexOfObject:_draggedItem];
+    }
+    MPDocument *document = [[[outlineView window] windowController] document];
+    accepted = [document group:_draggedItem isMoveableToGroup:target];
+    if( accepted ) {
+      [document moveGroup:_draggedItem toGroup:target index:index];
+    }
+    info.animatesToDestination = !accepted;
+    return accepted;
   }
-  MPDocument *document = [[[outlineView window] windowController] document];
-  accepted = [document group:_draggedItem isMoveableToGroup:target];
-  if( accepted ) {
-    [document moveGroup:_draggedItem toGroup:target index:index];
+  NSPasteboard *pasteBoard = [info draggingPasteboard];
+  NSArray *items = [pasteBoard pasteboardItems];
+  if([items count] > 0) {
+    NSPasteboardItem *item = items[0];
+    UUID *uuid = [[UUID alloc] initWithString:[item stringForType:MPPasteBoardType]];
+    MPDocument *document = [[[outlineView window] windowController] document];
+    KdbGroup *rootGroup = [document root];
+    KdbEntry *draggedEntry = [rootGroup entryForUUID:uuid];
+    if(draggedEntry) {
+      if(draggedEntry.parent != target && index == NSOutlineViewDropOnItemIndex) {
+        [document moveEntry:draggedEntry toGroup:target index:index];
+        return YES;
+      }
+    }
   }
-  info.animatesToDestination = !accepted;
-  return accepted;
+  return NO;
 }
 @end
diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m
index b46dbf9c..7c572490 100644
--- a/MacPass/MPOutlineViewController.m
+++ b/MacPass/MPOutlineViewController.m
@@ -14,6 +14,7 @@
 #import "KdbLib.h"
 #import "KdbGroup+Undo.h"
 #import "MPContextMenuHelper.h"
+#import "MPConstants.h"
 
 
 @interface MPOutlineViewController () {
diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m
index 9ddebe24..3c0b1c95 100644
--- a/MacPass/MPPasswordInputController.m
+++ b/MacPass/MPPasswordInputController.m
@@ -20,8 +20,6 @@
 @property (assign) IBOutlet NSTextField *errorInfoTextField;
 
 - (IBAction)_decrypt:(id)sender;
-- (void)_showError;
-- (void)_reset;
 
 @end
 
diff --git a/MacPass/MPPasteBoardController.m b/MacPass/MPPasteBoardController.m
index 9272efc5..dbe8819f 100644
--- a/MacPass/MPPasteBoardController.m
+++ b/MacPass/MPPasteBoardController.m
@@ -13,10 +13,6 @@
 
 @property (assign) BOOL isEmpty;
 
-- (void)_clearPasteboardContents;
-- (void)_setupBindings;
-- (void)_updateNotifications;
-
 @end
 
 @implementation MPPasteBoardController
diff --git a/MacPass/MPSettingsHelper.m b/MacPass/MPSettingsHelper.m
index 14ce2e60..2a0e269d 100644
--- a/MacPass/MPSettingsHelper.m
+++ b/MacPass/MPSettingsHelper.m
@@ -12,12 +12,6 @@ NSString *const kMPSettingsKeyPasteboardClearTimeout = @"ClipboardClearTimeout";
 NSString *const kMPSettingsKeyClearPasteboardOnQuit  = @"ClearClipboardOnQuit";
 NSString *const kMPSettingsKeyOpenEmptyDatabaseOnLaunch = @"OpenEmptyDatabaseOnLaunch";
 
-@interface MPSettingsHelper ()
-
-+ (NSDictionary *)_standardDefaults;
-
-@end
-
 @implementation MPSettingsHelper
 
 + (void)setupDefaults {
diff --git a/MacPass/MPSettingsWindowController.m b/MacPass/MPSettingsWindowController.m
index 9978a890..c0cf9609 100644
--- a/MacPass/MPSettingsWindowController.m
+++ b/MacPass/MPSettingsWindowController.m
@@ -15,10 +15,6 @@
 @property (retain, nonatomic) NSMutableDictionary *settingsController;
 @property (retain, nonatomic) NSMutableDictionary *toolbarItems;
 
-- (void)_addSettingsTab:(id<MPSettingsTab>)tabController;
-- (void)_setupDefaultSettingsTabs;
-- (void)_showSettingsTab:(id)sender;
-
 @end
 
 @implementation MPSettingsWindowController
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index efe94e2d..06dec301 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>B23</string>
+	<string>B85</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>