From f56c3252429f919707d02a09b7183892883d7d7c Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Fri, 28 Jun 2013 02:17:49 +0200
Subject: [PATCH] Changed custom fields to use a tableview Custom fields are
 stored and loaded, missing Undo

---
 MacPass.xcodeproj/project.pbxproj            |   24 +
 MacPass/Base.lproj/InspectorView.xib         | 1255 ++++++++++++++----
 MacPass/Kdb4Entry+KVOAdditions.h             |   19 +
 MacPass/Kdb4Entry+KVOAdditions.m             |   29 +
 MacPass/Kdb4Tree+KVOAdditions.h              |   19 +
 MacPass/Kdb4Tree+KVOAdditions.m              |   29 +
 MacPass/Kdb4Tree+Undo.h                      |   58 +
 MacPass/Kdb4Tree+Undo.m                      |  127 ++
 MacPass/MPCustomFieldTableCellView.h         |   17 +
 MacPass/MPCustomFieldTableCellView.m         |   17 +
 MacPass/MPDocument.h                         |    4 +
 MacPass/MPDocument.m                         |   28 +-
 MacPass/MPDocumentSettingsWindowController.m |   15 +-
 MacPass/MPInspectorViewController.h          |    1 +
 MacPass/MPInspectorViewController.m          |  120 +-
 MacPass/MacPass-Info.plist                   |    2 +-
 MacPass/de.lproj/Localizable.strings         |  Bin 5528 -> 6092 bytes
 MacPass/en.lproj/Localizable.strings         |  Bin 5370 -> 5906 bytes
 18 files changed, 1441 insertions(+), 323 deletions(-)
 create mode 100644 MacPass/Kdb4Entry+KVOAdditions.h
 create mode 100644 MacPass/Kdb4Entry+KVOAdditions.m
 create mode 100644 MacPass/Kdb4Tree+KVOAdditions.h
 create mode 100644 MacPass/Kdb4Tree+KVOAdditions.m
 create mode 100644 MacPass/Kdb4Tree+Undo.h
 create mode 100644 MacPass/Kdb4Tree+Undo.m
 create mode 100644 MacPass/MPCustomFieldTableCellView.h
 create mode 100644 MacPass/MPCustomFieldTableCellView.m

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 606faaaf..0afc05bd 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -51,6 +51,8 @@
 		4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */; };
 		4C2E382316D1421B00037A9D /* MPIconHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382216D1421B00037A9D /* MPIconHelper.m */; };
 		4C2E382616D1470200037A9D /* MPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382516D1470200037A9D /* MPViewController.m */; };
+		4C36E5B1177CD38C00152132 /* Kdb4Tree+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C36E5B0177CD38C00152132 /* Kdb4Tree+Undo.m */; };
+		4C36E5B4177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C36E5B3177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m */; };
 		4C37A6731769393300AD0A40 /* HNHTableHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */; };
 		4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; };
 		4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; };
@@ -63,6 +65,8 @@
 		4C46E09E17673A0A00DA62E8 /* HNHShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */; };
 		4C4A100F176286FD00BBF2CA /* MPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A100E176286FD00BBF2CA /* MPTableView.m */; };
 		4C4A101217629DA900BBF2CA /* KdbGroup+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */; };
+		4C4FCE15177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */; };
+		4C4FCE18177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FCE17177D03D700BBF7AE /* Kdb4Entry+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 */; };
@@ -268,6 +272,10 @@
 		4C2E382216D1421B00037A9D /* MPIconHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIconHelper.m; sourceTree = "<group>"; };
 		4C2E382416D1470200037A9D /* MPViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPViewController.h; sourceTree = "<group>"; };
 		4C2E382516D1470200037A9D /* MPViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPViewController.m; sourceTree = "<group>"; };
+		4C36E5AF177CD38C00152132 /* Kdb4Tree+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Kdb4Tree+Undo.h"; sourceTree = "<group>"; };
+		4C36E5B0177CD38C00152132 /* Kdb4Tree+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Kdb4Tree+Undo.m"; sourceTree = "<group>"; };
+		4C36E5B2177CD4FB00152132 /* Kdb4Tree+KVOAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Kdb4Tree+KVOAdditions.h"; sourceTree = "<group>"; };
+		4C36E5B3177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Kdb4Tree+KVOAdditions.m"; sourceTree = "<group>"; };
 		4C37A6711769393300AD0A40 /* HNHTableHeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHTableHeaderCell.h; sourceTree = "<group>"; };
 		4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHTableHeaderCell.m; sourceTree = "<group>"; };
 		4C37A83E15B8B474005EF8EE /* MPOutlineDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineDataSource.h; sourceTree = "<group>"; };
@@ -290,6 +298,10 @@
 		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>"; };
+		4C4FCE13177CFE6B00BBF7AE /* MPCustomFieldTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCustomFieldTableCellView.h; sourceTree = "<group>"; };
+		4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCustomFieldTableCellView.m; sourceTree = "<group>"; };
+		4C4FCE16177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Kdb4Entry+KVOAdditions.h"; sourceTree = "<group>"; };
+		4C4FCE17177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Kdb4Entry+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>"; };
@@ -561,6 +573,8 @@
 				4CE39AC316ECE4F7000FE29D /* MPPopupImageView.m */,
 				4C4A100D176286FD00BBF2CA /* MPTableView.h */,
 				4C4A100E176286FD00BBF2CA /* MPTableView.m */,
+				4C4FCE13177CFE6B00BBF7AE /* MPCustomFieldTableCellView.h */,
+				4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -739,8 +753,14 @@
 				4C01C23E1764D2980016D5D0 /* KdbEntry+Undo.m */,
 				4C22040B1746ED160054C916 /* KdbGroup+Undo.h */,
 				4C22040C1746ED160054C916 /* KdbGroup+Undo.m */,
+				4C36E5AF177CD38C00152132 /* Kdb4Tree+Undo.h */,
+				4C36E5B0177CD38C00152132 /* Kdb4Tree+Undo.m */,
 				4C4A101017629DA900BBF2CA /* KdbGroup+KVOAdditions.h */,
 				4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */,
+				4C36E5B2177CD4FB00152132 /* Kdb4Tree+KVOAdditions.h */,
+				4C36E5B3177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m */,
+				4C4FCE16177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.h */,
+				4C4FCE17177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m */,
 				4C83F4A81774B155006C5FC0 /* Kdb3Tree+NewTree.h */,
 				4C83F4A91774B155006C5FC0 /* Kdb3Tree+NewTree.m */,
 				4C83F4AB1774B25F006C5FC0 /* Kdb4Tree+NewTree.h */,
@@ -1442,6 +1462,10 @@
 				4CD5D705177A5F3300100649 /* MPDocumentSettingsWindowController.m in Sources */,
 				4C5EC302177B700D00DA955B /* MPRootAdapter.m in Sources */,
 				4C74DD07177BD1640034A9DB /* MPCustomFieldView.m in Sources */,
+				4C36E5B1177CD38C00152132 /* Kdb4Tree+Undo.m in Sources */,
+				4C36E5B4177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m in Sources */,
+				4C4FCE15177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m in Sources */,
+				4C4FCE18177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 0ad4da1a..6d96bf9b 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -91,7 +91,7 @@
 					<object class="NSTextField" id="787130496">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{73, 477}, {209, 17}}</string>
+						<string key="NSFrame">{{73, 477}, {203, 17}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="166081160"/>
@@ -134,16 +134,17 @@
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews"/>
-						<string key="NSFrameSize">{299, 30}</string>
+						<string key="NSFrameSize">{293, 30}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSClassName">HNHGradientView</string>
 					</object>
 					<object class="NSSegmentedControl" id="894571713">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{67, 429}, {165, 25}}</string>
+						<string key="NSFrame">{{64, 429}, {165, 25}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="816254670"/>
@@ -198,7 +199,7 @@
 					<object class="NSTabView" id="166081160">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">12</int>
-						<string key="NSFrame">{{0, 31}, {299, 399}}</string>
+						<string key="NSFrame">{{0, 31}, {293, 399}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="177600245"/>
@@ -245,7 +246,7 @@
 										<object class="NSTextField" id="909883915">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 335}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 335}, {253, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="328122838"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -299,7 +300,7 @@
 										<object class="NSTextField" id="800408621">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 283}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 283}, {253, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="428053603"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -320,7 +321,7 @@
 										<object class="NSTextField" id="484293743">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 231}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 231}, {253, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="279643156"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -381,7 +382,7 @@
 										<object class="NSTextField" id="25956638">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 179}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 179}, {253, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="172507372"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -402,7 +403,7 @@
 										<object class="NSButton" id="172507372">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 152}, {259, 19}}</string>
+											<string key="NSFrame">{{20, 152}, {253, 19}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="451174458"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -451,7 +452,7 @@
 										<object class="NSLevelIndicator" id="889716404">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 105}, {259, 18}}</string>
+											<string key="NSFrame">{{20, 105}, {253, 18}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="13391205"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -514,7 +515,7 @@
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrameSize">{299, 399}</string>
+									<string key="NSFrameSize">{293, 399}</string>
 									<reference key="NSNextKeyView" ref="734056912"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 								</object>
@@ -539,9 +540,9 @@
 														<object class="NSTextView" id="569376381">
 															<reference key="NSNextResponder" ref="454120122"/>
 															<int key="NSvFlags">2322</int>
-															<string key="NSFrameSize">{257, 332}</string>
+															<string key="NSFrameSize">{251, 332}</string>
 															<reference key="NSSuperview" ref="454120122"/>
-															<reference key="NSNextKeyView" ref="657519150"/>
+															<reference key="NSNextKeyView" ref="942541726"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="77792568">
 																<object class="NSLayoutManager" key="NSLayoutManager">
@@ -558,7 +559,7 @@
 																	<nil key="NSDelegate"/>
 																</object>
 																<reference key="NSTextView" ref="569376381"/>
-																<double key="NSWidth">257</double>
+																<double key="NSWidth">251</double>
 																<int key="NSTCFlags">1</int>
 															</object>
 															<object class="NSTextViewSharedData" key="NSSharedData">
@@ -601,7 +602,7 @@
 															<nil key="NSDelegate"/>
 														</object>
 													</array>
-													<string key="NSFrame">{{1, 1}, {257, 332}}</string>
+													<string key="NSFrame">{{1, 1}, {251, 332}}</string>
 													<reference key="NSSuperview" ref="850153963"/>
 													<reference key="NSNextKeyView" ref="569376381"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
@@ -631,7 +632,7 @@
 												<object class="NSScroller" id="942541726">
 													<reference key="NSNextResponder" ref="850153963"/>
 													<int key="NSvFlags">256</int>
-													<string key="NSFrame">{{242, 1}, {16, 332}}</string>
+													<string key="NSFrame">{{236, 1}, {16, 332}}</string>
 													<reference key="NSSuperview" ref="850153963"/>
 													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:83</string>
@@ -656,9 +657,9 @@
 													<double key="NSPercent">0.94565218687057495</double>
 												</object>
 											</array>
-											<string key="NSFrame">{{20, 20}, {259, 334}}</string>
+											<string key="NSFrame">{{20, 20}, {253, 334}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
-											<reference key="NSNextKeyView" ref="454120122"/>
+											<reference key="NSNextKeyView" ref="657519150"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133138</int>
 											<reference key="NSVScroller" ref="942541726"/>
@@ -689,7 +690,7 @@
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrameSize">{299, 399}</string>
+									<string key="NSFrameSize">{293, 399}</string>
 									<reference key="NSNextKeyView" ref="564843810"/>
 									<string key="NSReuseIdentifierKey">_NS:28</string>
 								</object>
@@ -705,7 +706,7 @@
 										<object class="NSButton" id="394980328">
 											<reference key="NSNextResponder" ref="292493070"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{217, 19}, {62, 19}}</string>
+											<string key="NSFrame">{{211, 19}, {62, 19}}</string>
 											<reference key="NSSuperview" ref="292493070"/>
 											<reference key="NSNextKeyView" ref="894571713"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -729,7 +730,7 @@
 										<object class="NSButton" id="445963820">
 											<reference key="NSNextResponder" ref="292493070"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{145, 19}, {64, 19}}</string>
+											<string key="NSFrame">{{139, 19}, {64, 19}}</string>
 											<reference key="NSSuperview" ref="292493070"/>
 											<reference key="NSNextKeyView" ref="394980328"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -741,7 +742,7 @@
 												<reference key="NSSupport" ref="323604925"/>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="445963820"/>
-												<int key="NSButtonFlags">-2038153216</int>
+												<int key="NSButtonFlags">-2033434624</int>
 												<int key="NSButtonFlags2">164</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
@@ -782,7 +783,7 @@
 															<reference key="NSNextResponder" ref="385885401"/>
 															<int key="NSvFlags">256</int>
 															<array class="NSMutableArray" key="NSSubviews"/>
-															<string key="NSFrameSize">{257, 304}</string>
+															<string key="NSFrameSize">{251, 304}</string>
 															<reference key="NSSuperview" ref="385885401"/>
 															<reference key="NSNextKeyView" ref="998331805"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
@@ -798,7 +799,7 @@
 															</object>
 															<array class="NSMutableArray" key="NSTableColumns">
 																<object class="NSTableColumn" id="361499112">
-																	<double key="NSWidth">254</double>
+																	<double key="NSWidth">248</double>
 																	<double key="NSMinWidth">40</double>
 																	<double key="NSMaxWidth">1000</double>
 																	<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -810,7 +811,7 @@
 																			<int key="NSColorSpace">3</int>
 																			<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
 																		</object>
-																		<object class="NSColor" key="NSTextColor">
+																		<object class="NSColor" key="NSTextColor" id="1059404200">
 																			<int key="NSColorSpace">6</int>
 																			<string key="NSCatalogName">System</string>
 																			<string key="NSColorName">headerTextColor</string>
@@ -840,7 +841,7 @@
 															<double key="NSIntercellSpacingWidth">3</double>
 															<double key="NSIntercellSpacingHeight">2</double>
 															<reference key="NSBackgroundColor" ref="566946319"/>
-															<object class="NSColor" key="NSGridColor">
+															<object class="NSColor" key="NSGridColor" id="771228525">
 																<int key="NSColorSpace">6</int>
 																<string key="NSCatalogName">System</string>
 																<string key="NSColorName">gridColor</string>
@@ -861,7 +862,7 @@
 															<int key="NSTableViewGroupRowStyle">1</int>
 														</object>
 													</array>
-													<string key="NSFrame">{{1, 1}, {257, 304}}</string>
+													<string key="NSFrame">{{1, 1}, {251, 304}}</string>
 													<reference key="NSSuperview" ref="994354248"/>
 													<reference key="NSNextKeyView" ref="1017381471"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
@@ -895,7 +896,7 @@
 													<double key="NSPercent">0.99487179487179489</double>
 												</object>
 											</array>
-											<string key="NSFrame">{{20, 48}, {259, 306}}</string>
+											<string key="NSFrame">{{20, 48}, {253, 306}}</string>
 											<reference key="NSSuperview" ref="292493070"/>
 											<reference key="NSNextKeyView" ref="385885401"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -909,7 +910,7 @@
 											<double key="NSMagnification">1</double>
 										</object>
 									</array>
-									<string key="NSFrameSize">{299, 399}</string>
+									<string key="NSFrameSize">{293, 399}</string>
 									<reference key="NSNextKeyView" ref="1028562761"/>
 								</object>
 								<string key="NSLabel">Attachments</string>
@@ -924,10 +925,10 @@
 										<object class="NSButton" id="966066653">
 											<reference key="NSNextResponder" ref="177600245"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{247, 362}, {32, 19}}</string>
+											<string key="NSFrame">{{241, 362}, {32, 19}}</string>
 											<reference key="NSSuperview" ref="177600245"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="166081160"/>
+											<reference key="NSNextKeyView" ref="892620201"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="466119848">
@@ -971,8 +972,134 @@
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
+										<object class="NSScrollView" id="892620201">
+											<reference key="NSNextResponder" ref="177600245"/>
+											<int key="NSvFlags">268</int>
+											<array class="NSMutableArray" key="NSSubviews">
+												<object class="NSClipView" id="236190992">
+													<reference key="NSNextResponder" ref="892620201"/>
+													<int key="NSvFlags">2304</int>
+													<array class="NSMutableArray" key="NSSubviews">
+														<object class="NSTableView" id="441697535">
+															<reference key="NSNextResponder" ref="236190992"/>
+															<int key="NSvFlags">256</int>
+															<array class="NSMutableArray" key="NSSubviews"/>
+															<string key="NSFrameSize">{261, 335}</string>
+															<reference key="NSSuperview" ref="236190992"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="291769955"/>
+															<string key="NSReuseIdentifierKey">_NS:13</string>
+															<bool key="NSEnabled">YES</bool>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															<bool key="NSControlAllowsExpansionToolTips">YES</bool>
+															<object class="_NSCornerView" key="NSCornerView">
+																<nil key="NSNextResponder"/>
+																<int key="NSvFlags">-2147483392</int>
+																<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+																<reference key="NSNextKeyView" ref="236190992"/>
+																<string key="NSReuseIdentifierKey">_NS:19</string>
+															</object>
+															<array class="NSMutableArray" key="NSTableColumns">
+																<object class="NSTableColumn" id="330991171">
+																	<double key="NSWidth">258</double>
+																	<double key="NSMinWidth">40</double>
+																	<double key="NSMaxWidth">1000</double>
+																	<object class="NSTableHeaderCell" key="NSHeaderCell">
+																		<int key="NSCellFlags">75497536</int>
+																		<int key="NSCellFlags2">2048</int>
+																		<string key="NSContents"/>
+																		<reference key="NSSupport" ref="26"/>
+																		<object class="NSColor" key="NSBackgroundColor">
+																			<int key="NSColorSpace">3</int>
+																			<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+																		</object>
+																		<reference key="NSTextColor" ref="1059404200"/>
+																	</object>
+																	<object class="NSTextFieldCell" key="NSDataCell" id="559416629">
+																		<int key="NSCellFlags">337641536</int>
+																		<int key="NSCellFlags2">2048</int>
+																		<string key="NSContents">Text Cell</string>
+																		<reference key="NSSupport" ref="308723166"/>
+																		<reference key="NSControlView" ref="441697535"/>
+																		<reference key="NSBackgroundColor" ref="238712209"/>
+																		<reference key="NSTextColor" ref="345368012"/>
+																	</object>
+																	<int key="NSResizingMask">3</int>
+																	<bool key="NSIsResizeable">YES</bool>
+																	<bool key="NSIsEditable">YES</bool>
+																	<reference key="NSTableView" ref="441697535"/>
+																</object>
+															</array>
+															<double key="NSIntercellSpacingWidth">3</double>
+															<double key="NSIntercellSpacingHeight">2</double>
+															<reference key="NSBackgroundColor" ref="533509460"/>
+															<reference key="NSGridColor" ref="771228525"/>
+															<double key="NSRowHeight">54</double>
+															<int key="NSTvFlags">-1774190592</int>
+															<reference key="NSDelegate"/>
+															<reference key="NSDataSource"/>
+															<int key="NSColumnAutoresizingStyle">4</int>
+															<int key="NSDraggingSourceMaskForLocal">15</int>
+															<int key="NSDraggingSourceMaskForNonLocal">0</int>
+															<bool key="NSAllowsTypeSelect">YES</bool>
+															<int key="NSTableViewSelectionHighlightStyle">-1</int>
+															<int key="NSTableViewDraggingDestinationStyle">0</int>
+															<int key="NSTableViewGroupRowStyle">1</int>
+														</object>
+													</array>
+													<string key="NSFrameSize">{261, 335}</string>
+													<reference key="NSSuperview" ref="892620201"/>
+													<reference key="NSWindow"/>
+													<reference key="NSNextKeyView" ref="441697535"/>
+													<string key="NSReuseIdentifierKey">_NS:11</string>
+													<reference key="NSDocView" ref="441697535"/>
+													<reference key="NSBGColor" ref="238712209"/>
+													<int key="NScvFlags">2</int>
+												</object>
+												<object class="NSScroller" id="101606984">
+													<reference key="NSNextResponder" ref="892620201"/>
+													<int key="NSvFlags">-2147483392</int>
+													<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+													<reference key="NSSuperview" ref="892620201"/>
+													<reference key="NSWindow"/>
+													<reference key="NSNextKeyView" ref="1045948787"/>
+													<string key="NSReuseIdentifierKey">_NS:58</string>
+													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+													<reference key="NSTarget" ref="892620201"/>
+													<string key="NSAction">_doScroller:</string>
+													<double key="NSPercent">0.99702380952380953</double>
+												</object>
+												<object class="NSScroller" id="1045948787">
+													<reference key="NSNextResponder" ref="892620201"/>
+													<int key="NSvFlags">-2147483392</int>
+													<string key="NSFrame">{{1, 119}, {223, 15}}</string>
+													<reference key="NSSuperview" ref="892620201"/>
+													<reference key="NSWindow"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
+													<string key="NSReuseIdentifierKey">_NS:60</string>
+													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+													<int key="NSsFlags">1</int>
+													<reference key="NSTarget" ref="892620201"/>
+													<string key="NSAction">_doScroller:</string>
+													<double key="NSPercent">0.99615384615384617</double>
+												</object>
+											</array>
+											<string key="NSFrame">{{16, 20}, {261, 335}}</string>
+											<reference key="NSSuperview" ref="177600245"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="236190992"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<int key="NSsFlags">133680</int>
+											<reference key="NSVScroller" ref="101606984"/>
+											<reference key="NSHScroller" ref="1045948787"/>
+											<reference key="NSContentView" ref="236190992"/>
+											<bytes key="NSScrollAmts">QSAAAEEgAABCYAAAQmAAAA</bytes>
+											<double key="NSMinMagnification">0.25</double>
+											<double key="NSMaxMagnification">4</double>
+											<double key="NSMagnification">1</double>
+										</object>
 									</array>
-									<string key="NSFrameSize">{299, 399}</string>
+									<string key="NSFrameSize">{293, 399}</string>
 									<reference key="NSSuperview" ref="166081160"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="40836012"/>
@@ -992,7 +1119,7 @@
 						</array>
 					</object>
 				</array>
-				<string key="NSFrameSize">{299, 529}</string>
+				<string key="NSFrameSize">{293, 529}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1013751338"/>
@@ -1153,6 +1280,14 @@
 					</object>
 					<int key="connectionID">2006</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">customFieldsTableView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="441697535"/>
+					</object>
+					<int key="connectionID">2068</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">imageView</string>
@@ -1195,7 +1330,7 @@
 								<object class="NSTextField" id="485748133">
 									<reference key="NSNextResponder" ref="998331805"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{25, 0}, {229, 17}}</string>
+									<string key="NSFrame">{{25, 0}, {223, 17}}</string>
 									<reference key="NSSuperview" ref="998331805"/>
 									<reference key="NSNextKeyView" ref="360758282"/>
 									<string key="NSReuseIdentifierKey">_NS:20</string>
@@ -1214,7 +1349,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{1, 1}, {254, 17}}</string>
+							<string key="NSFrame">{{1, 1}, {248, 17}}</string>
 							<reference key="NSNextKeyView" ref="636217037"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 						</object>
@@ -1230,6 +1365,108 @@
 					</object>
 					<int key="connectionID">1571</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">valueTextField</string>
+						<object class="NSTableCellView" key="source" id="291769955">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSTextField" id="397967954">
+									<reference key="NSNextResponder" ref="291769955"/>
+									<int key="NSvFlags">268</int>
+									<string key="NSFrame">{{3, 10}, {210, 22}}</string>
+									<reference key="NSSuperview" ref="291769955"/>
+									<reference key="NSNextKeyView" ref="966655738"/>
+									<string key="NSReuseIdentifierKey">_NS:9</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="253973021">
+										<int key="NSCellFlags">-1804599231</int>
+										<int key="NSCellFlags2">272630784</int>
+										<string key="NSContents"/>
+										<reference key="NSSupport" ref="308723166"/>
+										<string key="NSPlaceholderString">Value</string>
+										<string key="NSCellIdentifier">_NS:9</string>
+										<reference key="NSControlView" ref="397967954"/>
+										<bool key="NSDrawsBackground">YES</bool>
+										<reference key="NSBackgroundColor" ref="955209345"/>
+										<reference key="NSTextColor" ref="412903852"/>
+									</object>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								</object>
+								<object class="NSTextField" id="607503214">
+									<reference key="NSNextResponder" ref="291769955"/>
+									<int key="NSvFlags">268</int>
+									<string key="NSFrame">{{0, 40}, {256, 14}}</string>
+									<reference key="NSSuperview" ref="291769955"/>
+									<reference key="NSNextKeyView" ref="397967954"/>
+									<string key="NSReuseIdentifierKey">_NS:9</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="523593612">
+										<int key="NSCellFlags">-1808793535</int>
+										<int key="NSCellFlags2">272761856</int>
+										<string key="NSContents"/>
+										<reference key="NSSupport" ref="26"/>
+										<string key="NSPlaceholderString">Title</string>
+										<string key="NSCellIdentifier">_NS:9</string>
+										<reference key="NSControlView" ref="607503214"/>
+										<reference key="NSBackgroundColor" ref="955209345"/>
+										<reference key="NSTextColor" ref="1062890562"/>
+									</object>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								</object>
+								<object class="NSButton" id="966655738">
+									<reference key="NSNextResponder" ref="291769955"/>
+									<int key="NSvFlags">268</int>
+									<string key="NSFrame">{{221, 11}, {32, 19}}</string>
+									<reference key="NSSuperview" ref="291769955"/>
+									<reference key="NSNextKeyView" ref="101606984"/>
+									<string key="NSReuseIdentifierKey">_NS:9</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSButtonCell" key="NSCell" id="26197670">
+										<int key="NSCellFlags">-2080374784</int>
+										<int key="NSCellFlags2">134217728</int>
+										<string key="NSContents"/>
+										<reference key="NSSupport" ref="323604925"/>
+										<string key="NSCellIdentifier">_NS:9</string>
+										<reference key="NSControlView" ref="966655738"/>
+										<int key="NSButtonFlags">-2033434624</int>
+										<int key="NSButtonFlags2">164</int>
+										<object class="NSCustomResource" key="NSNormalImage">
+											<string key="NSClassName">NSImage</string>
+											<string key="NSResourceName">NSRemoveTemplate</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>
+							</array>
+							<string key="NSFrame">{{1, 1}, {258, 54}}</string>
+							<reference key="NSNextKeyView" ref="607503214"/>
+						</object>
+						<reference key="destination" ref="397967954"/>
+					</object>
+					<int key="connectionID">2069</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">labelTextField</string>
+						<reference key="source" ref="291769955"/>
+						<reference key="destination" ref="607503214"/>
+					</object>
+					<int key="connectionID">2070</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">removeButton</string>
+						<reference key="source" ref="291769955"/>
+						<reference key="destination" ref="966655738"/>
+					</object>
+					<int key="connectionID">2173</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1673,22 +1910,6 @@
 						<int key="objectID">1396</int>
 						<reference key="object" ref="13134025"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="127309281">
-								<reference key="firstItem" ref="850153963"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="564843810"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="13134025"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="171913043">
 								<reference key="firstItem" ref="13134025"/>
 								<int key="firstAttribute">6</int>
@@ -1705,6 +1926,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="127309281">
+								<reference key="firstItem" ref="850153963"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="564843810"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="13134025"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="756530454">
 								<reference key="firstItem" ref="13134025"/>
 								<int key="firstAttribute">4</int>
@@ -1858,6 +2095,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="1023422007">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="889716404"/>
+								<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="726109125"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="98908673">
 								<reference key="firstItem" ref="889716404"/>
 								<int key="firstAttribute">3</int>
@@ -1874,22 +2127,6 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="120829582">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="889716404"/>
-								<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="726109125"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="307015338">
 								<reference key="firstItem" ref="889716404"/>
 								<int key="firstAttribute">5</int>
@@ -1938,6 +2175,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="806657697">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="172507372"/>
+								<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="726109125"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="574256349">
 								<reference key="firstItem" ref="172507372"/>
 								<int key="firstAttribute">3</int>
@@ -1954,12 +2207,12 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="230041507">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">6</int>
+							<object class="IBNSLayoutConstraint" id="833009099">
+								<reference key="firstItem" ref="172507372"/>
+								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="172507372"/>
-								<int key="secondAttribute">6</int>
+								<reference key="secondItem" ref="726109125"/>
+								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
@@ -1970,12 +2223,12 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="833009099">
-								<reference key="firstItem" ref="172507372"/>
-								<int key="firstAttribute">5</int>
+							<object class="IBNSLayoutConstraint" id="1048935945">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="726109125"/>
-								<int key="secondAttribute">5</int>
+								<reference key="secondItem" ref="25956638"/>
+								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
@@ -2002,22 +2255,6 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="798174181">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="25956638"/>
-								<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="726109125"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="928232729">
 								<reference key="firstItem" ref="25956638"/>
 								<int key="firstAttribute">5</int>
@@ -2066,6 +2303,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="118043141">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="484293743"/>
+								<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="726109125"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="922844847">
 								<reference key="firstItem" ref="484293743"/>
 								<int key="firstAttribute">3</int>
@@ -2082,22 +2335,6 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="968824540">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="484293743"/>
-								<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="726109125"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="902687269">
 								<reference key="firstItem" ref="484293743"/>
 								<int key="firstAttribute">5</int>
@@ -2146,6 +2383,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="1032125046">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="800408621"/>
+								<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="726109125"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="369364626">
 								<reference key="firstItem" ref="800408621"/>
 								<int key="firstAttribute">3</int>
@@ -2162,22 +2415,6 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="655376427">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="800408621"/>
-								<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="726109125"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="941986321">
 								<reference key="firstItem" ref="800408621"/>
 								<int key="firstAttribute">5</int>
@@ -2242,6 +2479,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="897356825">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="909883915"/>
+								<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="726109125"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="343185460">
 								<reference key="firstItem" ref="909883915"/>
 								<int key="firstAttribute">3</int>
@@ -2258,22 +2511,6 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="479844082">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="909883915"/>
-								<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="726109125"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="644631459">
 								<reference key="firstItem" ref="909883915"/>
 								<int key="firstAttribute">5</int>
@@ -2636,41 +2873,6 @@
 						<reference key="object" ref="307015338"/>
 						<reference key="parent" ref="726109125"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1798</int>
-						<reference key="object" ref="171913043"/>
-						<reference key="parent" ref="13134025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1806</int>
-						<reference key="object" ref="655376427"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1808</int>
-						<reference key="object" ref="479844082"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1810</int>
-						<reference key="object" ref="968824540"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1815</int>
-						<reference key="object" ref="798174181"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1817</int>
-						<reference key="object" ref="230041507"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1819</int>
-						<reference key="object" ref="120829582"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1849</int>
 						<reference key="object" ref="496215318"/>
@@ -2826,6 +3028,22 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="969134938">
+								<reference key="firstItem" ref="292493070"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="394980328"/>
+								<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="292493070"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="207294490">
 								<reference key="firstItem" ref="292493070"/>
 								<int key="firstAttribute">4</int>
@@ -2842,12 +3060,12 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="939741649">
+							<object class="IBNSLayoutConstraint" id="412901510">
 								<reference key="firstItem" ref="292493070"/>
-								<int key="firstAttribute">6</int>
+								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="394980328"/>
-								<int key="secondAttribute">6</int>
+								<reference key="secondItem" ref="445963820"/>
+								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
@@ -2858,12 +3076,12 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="412901510">
+							<object class="IBNSLayoutConstraint" id="626588286">
 								<reference key="firstItem" ref="292493070"/>
-								<int key="firstAttribute">4</int>
+								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="445963820"/>
-								<int key="secondAttribute">4</int>
+								<reference key="secondItem" ref="994354248"/>
+								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
@@ -2922,22 +3140,6 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="947482164">
-								<reference key="firstItem" ref="292493070"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="994354248"/>
-								<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="292493070"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="594217791">
 								<reference key="firstItem" ref="1028562761"/>
 								<int key="firstAttribute">5</int>
@@ -3021,6 +3223,70 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="645300569">
+								<reference key="firstItem" ref="177600245"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="892620201"/>
+								<int key="secondAttribute">4</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="177600245"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1062481963">
+								<reference key="firstItem" ref="177600245"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="892620201"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="177600245"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="66349935">
+								<reference key="firstItem" ref="892620201"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="966066653"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="177600245"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="109281840">
+								<reference key="firstItem" ref="892620201"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="177600245"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="177600245"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="277891311">
 								<reference key="firstItem" ref="40836012"/>
 								<int key="firstAttribute">5</int>
@@ -3055,6 +3321,7 @@
 							</object>
 							<reference ref="40836012"/>
 							<reference ref="966066653"/>
+							<reference ref="892620201"/>
 						</array>
 						<reference key="parent" ref="800410412"/>
 					</object>
@@ -3282,11 +3549,6 @@
 						<reference key="object" ref="313244465"/>
 						<reference key="parent" ref="485748133"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1949</int>
-						<reference key="object" ref="947482164"/>
-						<reference key="parent" ref="292493070"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1952</int>
 						<reference key="object" ref="421684971"/>
@@ -3388,16 +3650,6 @@
 						<reference key="object" ref="700726101"/>
 						<reference key="parent" ref="394980328"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1972</int>
-						<reference key="object" ref="939741649"/>
-						<reference key="parent" ref="292493070"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1975</int>
-						<reference key="object" ref="392529850"/>
-						<reference key="parent" ref="292493070"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1978</int>
 						<reference key="object" ref="105322693"/>
@@ -3462,11 +3714,6 @@
 						<reference key="object" ref="466119848"/>
 						<reference key="parent" ref="966066653"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1988</int>
-						<reference key="object" ref="612070871"/>
-						<reference key="parent" ref="177600245"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1990</int>
 						<reference key="object" ref="40836012"/>
@@ -3520,6 +3767,425 @@
 						<reference key="object" ref="591108553"/>
 						<reference key="parent" ref="966066653"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2009</int>
+						<reference key="object" ref="892620201"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="441697535"/>
+							<reference ref="1045948787"/>
+							<reference ref="101606984"/>
+						</array>
+						<reference key="parent" ref="177600245"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2010</int>
+						<reference key="object" ref="441697535"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="330991171"/>
+						</array>
+						<reference key="parent" ref="892620201"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2011</int>
+						<reference key="object" ref="1045948787"/>
+						<reference key="parent" ref="892620201"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2013</int>
+						<reference key="object" ref="101606984"/>
+						<reference key="parent" ref="892620201"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2014</int>
+						<reference key="object" ref="330991171"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="559416629"/>
+							<reference ref="291769955"/>
+						</array>
+						<reference key="parent" ref="441697535"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2017</int>
+						<reference key="object" ref="559416629"/>
+						<reference key="parent" ref="330991171"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2020</int>
+						<reference key="object" ref="109281840"/>
+						<reference key="parent" ref="177600245"/>
+						<string key="objectName">Horizontal Space - Scroll View - Table View - View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2021</int>
+						<reference key="object" ref="66349935"/>
+						<reference key="parent" ref="177600245"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2023</int>
+						<reference key="object" ref="645300569"/>
+						<reference key="parent" ref="177600245"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2024</int>
+						<reference key="object" ref="291769955"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="735303870">
+								<reference key="firstItem" ref="291769955"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="966655738"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">3</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="291769955"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="127801656">
+								<reference key="firstItem" ref="966655738"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="397967954"/>
+								<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="291769955"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="663335707">
+								<reference key="firstItem" ref="966655738"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="397967954"/>
+								<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="291769955"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="971621580">
+								<reference key="firstItem" ref="291769955"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="397967954"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">10</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="291769955"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="773673692">
+								<reference key="firstItem" ref="397967954"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="607503214"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="291769955"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="529925045">
+								<reference key="firstItem" ref="397967954"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="291769955"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">3</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="291769955"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="556249621">
+								<reference key="firstItem" ref="607503214"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="966655738"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="291769955"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="328710970">
+								<reference key="firstItem" ref="607503214"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="291769955"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">3</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="291769955"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="607503214"/>
+							<reference ref="397967954"/>
+							<reference ref="966655738"/>
+						</array>
+						<reference key="parent" ref="330991171"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2042</int>
+						<reference key="object" ref="397967954"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="253973021"/>
+							<object class="IBNSLayoutConstraint" id="268050676">
+								<reference key="firstItem" ref="397967954"/>
+								<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">100</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="397967954"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="788011316">
+								<reference key="firstItem" ref="397967954"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">22</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="397967954"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2043</int>
+						<reference key="object" ref="253973021"/>
+						<reference key="parent" ref="397967954"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2047</int>
+						<reference key="object" ref="607503214"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="523593612"/>
+							<object class="IBNSLayoutConstraint" id="36942014">
+								<reference key="firstItem" ref="607503214"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">14</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="607503214"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2049</int>
+						<reference key="object" ref="523593612"/>
+						<reference key="parent" ref="607503214"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1988</int>
+						<reference key="object" ref="612070871"/>
+						<reference key="parent" ref="177600245"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2022</int>
+						<reference key="object" ref="1062481963"/>
+						<reference key="parent" ref="177600245"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2074</int>
+						<reference key="object" ref="897356825"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2078</int>
+						<reference key="object" ref="1032125046"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2080</int>
+						<reference key="object" ref="118043141"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2082</int>
+						<reference key="object" ref="1048935945"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2083</int>
+						<reference key="object" ref="806657697"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2085</int>
+						<reference key="object" ref="1023422007"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2086</int>
+						<reference key="object" ref="171913043"/>
+						<reference key="parent" ref="13134025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2087</int>
+						<reference key="object" ref="626588286"/>
+						<reference key="parent" ref="292493070"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2090</int>
+						<reference key="object" ref="969134938"/>
+						<reference key="parent" ref="292493070"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2091</int>
+						<reference key="object" ref="392529850"/>
+						<reference key="parent" ref="292493070"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2098</int>
+						<reference key="object" ref="36942014"/>
+						<reference key="parent" ref="607503214"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2100</int>
+						<reference key="object" ref="788011316"/>
+						<reference key="parent" ref="397967954"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2134</int>
+						<reference key="object" ref="529925045"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2136</int>
+						<reference key="object" ref="328710970"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2141</int>
+						<reference key="object" ref="773673692"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2142</int>
+						<reference key="object" ref="971621580"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2144</int>
+						<reference key="object" ref="966655738"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="26197670"/>
+							<object class="IBNSLayoutConstraint" id="943826544">
+								<reference key="firstItem" ref="966655738"/>
+								<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="966655738"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2145</int>
+						<reference key="object" ref="26197670"/>
+						<reference key="parent" ref="966655738"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2147</int>
+						<reference key="object" ref="663335707"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2152</int>
+						<reference key="object" ref="943826544"/>
+						<reference key="parent" ref="966655738"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2153</int>
+						<reference key="object" ref="127801656"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2156</int>
+						<reference key="object" ref="556249621"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2165</int>
+						<reference key="object" ref="268050676"/>
+						<reference key="parent" ref="397967954"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2166</int>
+						<reference key="object" ref="735303870"/>
+						<reference key="parent" ref="291769955"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -3576,40 +4242,40 @@
 					<reference ref="105322693"/>
 					<reference ref="892809285"/>
 					<reference ref="756530454"/>
-					<reference ref="171913043"/>
 					<reference ref="127309281"/>
+					<reference ref="171913043"/>
 				</array>
 				<string key="1396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="1397.IBNSViewMetadataConstraints">
+				<array key="1397.IBNSViewMetadataConstraints">
 					<reference ref="866470549"/>
 					<reference ref="496215318"/>
 					<reference ref="644631459"/>
-					<reference ref="479844082"/>
 					<reference ref="343185460"/>
+					<reference ref="897356825"/>
 					<reference ref="471402495"/>
 					<reference ref="285556007"/>
 					<reference ref="331510875"/>
 					<reference ref="941986321"/>
-					<reference ref="655376427"/>
 					<reference ref="369364626"/>
+					<reference ref="1032125046"/>
 					<reference ref="250345161"/>
 					<reference ref="794358918"/>
 					<reference ref="902687269"/>
-					<reference ref="968824540"/>
 					<reference ref="922844847"/>
+					<reference ref="118043141"/>
 					<reference ref="1058462363"/>
 					<reference ref="502895567"/>
 					<reference ref="928232729"/>
-					<reference ref="798174181"/>
 					<reference ref="700884070"/>
+					<reference ref="1048935945"/>
 					<reference ref="833009099"/>
-					<reference ref="230041507"/>
 					<reference ref="574256349"/>
+					<reference ref="806657697"/>
 					<reference ref="345569903"/>
 					<reference ref="992431666"/>
 					<reference ref="307015338"/>
-					<reference ref="120829582"/>
 					<reference ref="98908673"/>
+					<reference ref="1023422007"/>
 					<reference ref="989194529"/>
 					<reference ref="332393876"/>
 					<reference ref="19592612"/>
@@ -3711,13 +4377,6 @@
 				<string key="1737.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1741.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1777.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1798.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1806.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1808.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1810.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1815.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1817.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1819.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1849.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1851.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1852.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3749,13 +4408,13 @@
 				<array class="NSMutableArray" key="1946.IBNSViewMetadataConstraints">
 					<reference ref="95408199"/>
 					<reference ref="594217791"/>
-					<reference ref="947482164"/>
 					<reference ref="421684971"/>
 					<reference ref="846179833"/>
 					<reference ref="953468380"/>
+					<reference ref="626588286"/>
 					<reference ref="412901510"/>
-					<reference ref="939741649"/>
 					<reference ref="207294490"/>
+					<reference ref="969134938"/>
 					<reference ref="392529850"/>
 				</array>
 				<string key="1946.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3763,18 +4422,19 @@
 				<array class="NSMutableArray" key="1948.IBNSViewMetadataConstraints">
 					<reference ref="376761754"/>
 					<reference ref="277891311"/>
+					<reference ref="109281840"/>
+					<reference ref="66349935"/>
+					<reference ref="1062481963"/>
+					<reference ref="645300569"/>
 					<reference ref="612070871"/>
 					<reference ref="1046830805"/>
 				</array>
 				<string key="1948.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1949.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1952.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1958.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1959.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1960.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1972.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1974.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1975.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1976.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1977.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1978.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3794,6 +4454,76 @@
 				<string key="1996.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2002.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2004.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="2009.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2009.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2010.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="2010.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
+				<string key="2011.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2013.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2014.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="2014.isInViewBasedMode"/>
+				<array key="2014.prototypeCellViews">
+					<reference ref="291769955"/>
+				</array>
+				<string key="2017.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2020.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2021.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2022.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2023.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2024.CustomClassName">MPCustomFieldTableCellView</string>
+				<array key="2024.IBNSViewMetadataConstraints">
+					<reference ref="328710970"/>
+					<reference ref="556249621"/>
+					<reference ref="529925045"/>
+					<reference ref="773673692"/>
+					<reference ref="971621580"/>
+					<reference ref="663335707"/>
+					<reference ref="127801656"/>
+					<reference ref="735303870"/>
+				</array>
+				<string key="2024.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="2042.IBNSViewMetadataConstraints">
+					<reference ref="788011316"/>
+					<reference ref="268050676"/>
+				</array>
+				<boolean value="NO" key="2042.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2042.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2043.CustomClassName">HNHRoundedTextFieldCell</string>
+				<string key="2043.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2047.IBNSViewMetadataConstraints">
+					<reference ref="36942014"/>
+				</array>
+				<boolean value="NO" key="2047.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2047.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2049.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2074.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2078.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2080.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2082.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2083.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2085.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2086.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2087.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2090.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2091.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2098.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2100.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2141.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2142.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2144.IBNSViewMetadataConstraints">
+					<reference ref="943826544"/>
+				</array>
+				<boolean value="NO" key="2144.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2147.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="455.IBNSViewMetadataConstraints">
 					<reference ref="222939184"/>
 					<reference ref="1058743908"/>
@@ -3840,7 +4570,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2008</int>
+			<int key="maxID">2173</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3884,28 +4614,56 @@
 						<string key="minorKey">./Classes/HNHRoundedTextFieldCell.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MPCustomFieldTableCellView</string>
+					<string key="superclassName">NSTableCellView</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="labelTextField">NSTextField</string>
+						<string key="removeButton">NSButton</string>
+						<string key="valueTextField">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="labelTextField">
+							<string key="name">labelTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="removeButton">
+							<string key="name">removeButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="valueTextField">
+							<string key="name">valueTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPCustomFieldTableCellView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">MPInspectorViewController</string>
 					<string key="superclassName">MPViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="_popUpPasswordGenerator:">id</string>
 						<string key="addCustomField:">id</string>
+						<string key="removeCustomField:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="_popUpPasswordGenerator:">
-							<string key="name">_popUpPasswordGenerator:</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBActionInfo" key="addCustomField:">
 							<string key="name">addCustomField:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="removeCustomField:">
+							<string key="name">removeCustomField:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="URLTextField">NSTextField</string>
 						<string key="attachmentTableView">NSTableView</string>
 						<string key="bottomBar">HNHGradientView</string>
 						<string key="createdTextField">NSTextField</string>
+						<string key="customFieldsTableView">NSTableView</string>
 						<string key="customFieldsTextField">NSTextField</string>
 						<string key="generatePasswordButton">NSButton</string>
 						<string key="infoTabControl">NSSegmentedControl</string>
@@ -3936,6 +4694,10 @@
 							<string key="name">createdTextField</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="customFieldsTableView">
+							<string key="name">customFieldsTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="customFieldsTextField">
 							<string key="name">customFieldsTextField</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -4027,6 +4789,7 @@
 			<string key="NSActionTemplate">{15, 15}</string>
 			<string key="NSAddTemplate">{8, 8}</string>
 			<string key="NSApplicationIcon">{128, 128}</string>
+			<string key="NSRemoveTemplate">{8, 8}</string>
 			<string key="NSSmartBadgeTemplate">{15, 15}</string>
 		</dictionary>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
diff --git a/MacPass/Kdb4Entry+KVOAdditions.h b/MacPass/Kdb4Entry+KVOAdditions.h
new file mode 100644
index 00000000..9afe4aa8
--- /dev/null
+++ b/MacPass/Kdb4Entry+KVOAdditions.h
@@ -0,0 +1,19 @@
+//
+//  Kdb4Entry+KVOAdditions.h
+//  MacPass
+//
+//  Created by Michael Starke on 28.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Node.h"
+
+@interface Kdb4Entry (KVOAdditions)
+
+- (NSUInteger)countOfStringFields;
+- (StringField *)objectInStringFieldsAtIndex:(NSUInteger)index;
+- (void)removeObjectFromStringFieldsAtIndex:(NSUInteger)anIndex;
+- (void)insertObject:(StringField *)stringfield inStringFieldsAtIndex:(NSUInteger)anIndex;
+
+
+@end
diff --git a/MacPass/Kdb4Entry+KVOAdditions.m b/MacPass/Kdb4Entry+KVOAdditions.m
new file mode 100644
index 00000000..7d682347
--- /dev/null
+++ b/MacPass/Kdb4Entry+KVOAdditions.m
@@ -0,0 +1,29 @@
+//
+//  Kdb4Entry+KVOAdditions.m
+//  MacPass
+//
+//  Created by Michael Starke on 28.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Entry+KVOAdditions.h"
+
+@implementation Kdb4Entry (KVOAdditions)
+
+- (NSUInteger)countOfStringFields {
+  return [self.stringFields count];
+}
+
+- (StringField *)objectInStringFieldsAtIndex:(NSUInteger)index {
+  return [self.stringFields objectAtIndex:index];
+}
+
+- (void)insertObject:(StringField *)stringfield inStringFieldsAtIndex:(NSUInteger)anIndex {
+  [self.stringFields insertObject:stringfield atIndex:anIndex];
+}
+
+- (void)removeObjectFromStringFieldsAtIndex:(NSUInteger)anIndex {
+  [self.stringFields removeObjectAtIndex:anIndex];
+}
+
+@end
diff --git a/MacPass/Kdb4Tree+KVOAdditions.h b/MacPass/Kdb4Tree+KVOAdditions.h
new file mode 100644
index 00000000..400e6980
--- /dev/null
+++ b/MacPass/Kdb4Tree+KVOAdditions.h
@@ -0,0 +1,19 @@
+//
+//  Kdb4Tree+KVOAdditions.h
+//  MacPass
+//
+//  Created by Michael Starke on 27.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Node.h"
+
+@interface Kdb4Tree (KVOAdditions)
+
+- (void)insertObject:(Binary *)binary inBinariesAtIndex:(NSUInteger)index;
+- (void)insertObject:(CustomIcon *)icon inCustomIconsAtIndex:(NSUInteger)index;
+
+- (CustomIcon *)objectInCustomIconsAtIndex:(NSUInteger)index;
+- (Binary *)objectInBinariesAtIndex:(NSUInteger)index;
+
+@end
diff --git a/MacPass/Kdb4Tree+KVOAdditions.m b/MacPass/Kdb4Tree+KVOAdditions.m
new file mode 100644
index 00000000..e313a923
--- /dev/null
+++ b/MacPass/Kdb4Tree+KVOAdditions.m
@@ -0,0 +1,29 @@
+//
+//  Kdb4Tree+KVOAdditions.m
+//  MacPass
+//
+//  Created by Michael Starke on 27.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Tree+KVOAdditions.h"
+
+@implementation Kdb4Tree (KVOAdditions)
+
+- (void)insertObject:(Binary *)binary inBinariesAtIndex:(NSUInteger)index {
+  [self.binaries insertObject:binary atIndex:index];
+}
+
+- (void)insertObject:(CustomIcon *)icon inCustomIconsAtIndex:(NSUInteger)index {
+  [self.customIcons insertObject:icon atIndex:index];
+}
+
+- (Binary *)objectInBinariesAtIndex:(NSUInteger)index {
+  return [self.binaries objectAtIndex:index];
+}
+
+- (CustomIcon *)objectInCustomIconsAtIndex:(NSUInteger)index {
+  return [self.customIcons objectAtIndex:index];
+}
+
+@end
diff --git a/MacPass/Kdb4Tree+Undo.h b/MacPass/Kdb4Tree+Undo.h
new file mode 100644
index 00000000..8489c532
--- /dev/null
+++ b/MacPass/Kdb4Tree+Undo.h
@@ -0,0 +1,58 @@
+//
+//  Kdb4Tree+Undo.h
+//  MacPass
+//
+//  Created by Michael Starke on 27.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Node.h"
+
+APPKIT_EXTERN NSString *const MPTree4DatabaseNameUndoableKey;
+APPKIT_EXTERN NSString *const MPTree4DatabaseDescriptionUndoableKey;
+APPKIT_EXTERN NSString *const MPTree4DatabaseDefaultUsernameUndoableKey;
+
+APPKIT_EXTERN NSString *const MPTree4ProtectNotesUndoableKey;
+APPKIT_EXTERN NSString *const MPTree4ProtectPasswordUndoableKey;
+APPKIT_EXTERN NSString *const MPTree4ProtectTitleUndoableKey;
+APPKIT_EXTERN NSString *const MPTree4ProtectUrlUndoableKey;
+APPKIT_EXTERN NSString *const MPTree4ProtectUsernameUndoableKey;
+
+@interface Kdb4Tree (Undo)
+
+- (NSString *)databaseNameUndoable;
+- (NSString *)databaseDescriptionUndoable;
+- (NSString *)defaultUserNameUndoable;
+
+- (void)setDatabaseDescriptionUndoable:(NSString *)databaseDescription;
+- (void)setDatabaseNameUndoable:(NSString *)databaseName;
+- (void)setDefaultUserNameUndoable:(NSString *)defaultUserName;
+
+- (BOOL)protectNotesUndoable;
+- (BOOL)protectPasswordUndoable;
+- (BOOL)protectTitleUndoable;
+- (BOOL)protectUrlUndoable;
+- (BOOL)protectUserNameUndoable;
+
+- (void)setProtectNotesUndoable:(BOOL)protectNotes;
+- (void)setProtectPasswordUndoable:(BOOL)protectPassword;
+- (void)setProtectTitleUndoable:(BOOL)protectTitle;
+- (void)setProtectUrlUndoable:(BOOL)protectUrl;
+- (void)setProtectUserNameUndoable:(BOOL)protectUserName;
+
+
+//@property(nonatomic, assign) NSInteger maintenanceHistoryDays;
+//
+//@property(nonatomic, retain) NSDate *masterKeyChanged;
+//@property(nonatomic, assign) NSInteger masterKeyChangeRec;
+//@property(nonatomic, assign) NSInteger masterKeyChangeForce;
+//
+//@property(nonatomic, assign) BOOL recycleBinEnabled;
+//@property(nonatomic, retain) NSDate *recycleBinChanged;
+//
+//@property(nonatomic, assign) NSInteger historyMaxItems;
+//@property(nonatomic, assign) NSInteger historyMaxSize;
+//
+//@property(nonatomic, readonly) NSMutableArray *binaries;
+
+@end
diff --git a/MacPass/Kdb4Tree+Undo.m b/MacPass/Kdb4Tree+Undo.m
new file mode 100644
index 00000000..1173921f
--- /dev/null
+++ b/MacPass/Kdb4Tree+Undo.m
@@ -0,0 +1,127 @@
+//
+//  Kdb4Tree+Undo.m
+//  MacPass
+//
+//  Created by Michael Starke on 27.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Tree+Undo.h"
+
+NSString *const MPTree4DatabaseNameUndoableKey            = @"databaseNameUndoable";
+NSString *const MPTree4DatabaseDescriptionUndoableKey     = @"databaseDescriptionUndoable";
+NSString *const MPTree4DatabaseDefaultUsernameUndoableKey = @"defaultUserNameUndoable";
+
+NSString *const MPTree4ProtectNotesUndoableKey            = @"protectNotesUndoable";
+NSString *const MPTree4ProtectPasswordUndoableKey         = @"protectPasswordUndoable";
+NSString *const MPTree4ProtectTitleUndoableKey            = @"protectTitleUndoable";
+NSString *const MPTree4ProtectUrlUndoableKey              = @"protectUrlUndoable";
+NSString *const MPTree4ProtectUsernameUndoableKey         = @"protectUserNameUndoable";
+
+@implementation Kdb4Tree (Undo)
+
+- (NSUndoManager *)undoManager {
+  return [[[NSDocumentController sharedDocumentController] currentDocument] undoManager];
+}
+
+
+- (NSString *)databaseDescriptionUndoable {
+  return self.databaseDescription;
+}
+
+- (NSString *)databaseNameUndoable {
+  return  self.databaseName;
+}
+
+
+- (NSString *)defaultUserNameUndoable {
+  return self.defaultUserName;
+}
+
+- (void)setDatabaseDescriptionUndoable:(NSString *)databaseDescription {
+  if(![self.databaseDescription isEqualToString:databaseDescription]) {
+    [[self undoManager] registerUndoWithTarget:self selector:@selector(setDatabaseDescriptionUndoable:) object:self.databaseDescription];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_DATABASE_DESCRIPTION", @"Undo edit databse description")];
+    self.databaseDescriptionChanged = [NSDate date];
+    self.databaseDescription = databaseDescription;
+  }
+}
+
+- (void)setDatabaseNameUndoable:(NSString *)databaseName {
+  if(![self.databaseName isEqualToString:databaseName]) {
+    [[self undoManager] registerUndoWithTarget:self selector:@selector(setDatabaseNameUndoable:) object:self.databaseName];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_DATABASE_NAME", @"Undo edit database name")];
+    self.databaseName = databaseName;
+    self.databaseNameChanged = [NSDate date];
+  }
+}
+
+- (void)setDefaultUserNameUndoable:(NSString *)defaultUserName {
+  if(![self.defaultUserName isEqualToString:defaultUserName]) {
+    [[self undoManager] registerUndoWithTarget:self selector:@selector(setDefaultUserNameUndoable:) object:self.defaultUserName];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_DEFAULT_USERNAME", @"Undo edit default username")];
+    self.defaultUserName = defaultUserName;
+    self.defaultUserNameChanged = [NSDate date];
+  }
+}
+
+- (BOOL)protectNotesUndoable {
+  return self.protectNotes;
+}
+
+- (BOOL)protectPasswordUndoable {
+  return self.protectPassword;
+}
+
+- (BOOL)protectTitleUndoable {
+  return self.protectTitle;
+}
+
+- (BOOL)protectUrlUndoable {
+  return self.protectUrl;
+}
+
+- (BOOL)protectUserNameUndoable {
+  return self.protectUserName;
+}
+
+- (void)setProtectNotesUndoable:(BOOL)protectNotes {
+  if(self.protectNotes != protectNotes) {
+    [[[self undoManager] prepareWithInvocationTarget:self] setProtectNotesUndoable:self.protectNotes];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNOD_SET_PROTECT_NOTES", @"")];
+    self.protectNotes = protectNotes;
+  }
+}
+
+- (void)setProtectPasswordUndoable:(BOOL)protectPassword {
+  if(self.protectPassword != protectPassword) {
+    [[[self undoManager] prepareWithInvocationTarget:self] setProtectPasswordUndoable:self.protectPassword];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_PROTECT_PASSWORD", @"")];
+    self.protectPassword = protectPassword;
+  }
+}
+
+- (void)setProtectTitleUndoable:(BOOL)protectTitle {
+  if(self.protectTitle != protectTitle) {
+    [[[self undoManager] prepareWithInvocationTarget:self] setProtectTitleUndoable:self.protectPassword];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_PROTECT_TITLE", @"")];
+    self.protectTitle = protectTitle;
+  }
+}
+
+- (void)setProtectUrlUndoable:(BOOL)protectUrl {
+  if(self.protectUrl != protectUrl) {
+    [[[self undoManager] prepareWithInvocationTarget:self] setProtectUrlUndoable:self.protectUrl];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_PROTECT_URL", @"")];
+    self.protectUrl = protectUrl;
+  }
+}
+
+- (void)setProtectUserNameUndoable:(BOOL)protectUserName {
+  if(self.protectUserName != protectUserName) {
+    [[[self undoManager] prepareWithInvocationTarget:self] setProtectUserNameUndoable:self.protectUserName];
+    [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_PROTECT_USERNAME", @"")];
+    self.protectUserName = protectUserName;
+  }
+}
+@end
diff --git a/MacPass/MPCustomFieldTableCellView.h b/MacPass/MPCustomFieldTableCellView.h
new file mode 100644
index 00000000..97b3c876
--- /dev/null
+++ b/MacPass/MPCustomFieldTableCellView.h
@@ -0,0 +1,17 @@
+//
+//  MPCustomFieldTableCellView.h
+//  MacPass
+//
+//  Created by Michael Starke on 28.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface MPCustomFieldTableCellView : NSTableCellView
+
+@property (assign) IBOutlet NSTextField *labelTextField;
+@property (assign) IBOutlet NSTextField *valueTextField;
+@property (assign) IBOutlet NSButton *removeButton;
+
+@end
diff --git a/MacPass/MPCustomFieldTableCellView.m b/MacPass/MPCustomFieldTableCellView.m
new file mode 100644
index 00000000..1f949a06
--- /dev/null
+++ b/MacPass/MPCustomFieldTableCellView.m
@@ -0,0 +1,17 @@
+//
+//  MPCustomFieldTableCellView.m
+//  MacPass
+//
+//  Created by Michael Starke on 28.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPCustomFieldTableCellView.h"
+
+@implementation MPCustomFieldTableCellView
+
+- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle {
+  [super setBackgroundStyle:NSBackgroundStyleLight];
+}
+
+@end
diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h
index f51a592e..671302f2 100644
--- a/MacPass/MPDocument.h
+++ b/MacPass/MPDocument.h
@@ -22,6 +22,8 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 @class KdbGroup;
 @class KdbEntry;
 @class KdbTree;
+@class Kdb4Tree;
+@class Kdb3Tree;
 @class UUID;
 @class Binary;
 @class BinaryRef;
@@ -56,6 +58,8 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
  */
 - (Binary *)binaryForRef:(BinaryRef *)binaryRef;
 
+- (Kdb4Tree *)treeV4;
+- (Kdb3Tree *)treeV3;
 
 #pragma mark Data Manipulation
 /* Undoable Intiialization of elements */
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 3f097e9e..dd2a78b0 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -225,11 +225,37 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   return [filteredBinary lastObject];
 }
 
+- (Kdb3Tree *)treeV3 {
+  switch (_version) {
+    case MPDatabaseVersion3:
+      NSAssert([self.tree isKindOfClass:[Kdb3Tree class]], @"Tree has to be Version3");
+      return (Kdb3Tree *)self.tree;
+    case MPDatabaseVersion4:
+      return nil;
+    default:
+      return nil;
+  }
+}
+
+- (Kdb4Tree *)treeV4 {
+  switch (_version) {
+    case MPDatabaseVersion3:
+      return nil;
+    case MPDatabaseVersion4:
+      NSAssert([self.tree isKindOfClass:[Kdb4Tree class]], @"Tree has to be Version4");
+      return (Kdb4Tree *)self.tree;
+    default:
+      return nil;
+  }
+}
 
 #pragma mark Data manipulation
 - (KdbEntry *)createEntry:(KdbGroup *)parent {
   KdbEntry *newEntry = [self.tree createEntry:parent];
   newEntry.title = NSLocalizedString(@"DEFAULT_ENTRY_TITLE", @"Title for a newly created entry");
+  if(self.treeV4 && ([self.treeV4.defaultUserName length] > 0)) {
+    newEntry.title = self.treeV4.defaultUserName;
+  }
   [self group:parent addEntry:newEntry];
   NSDictionary *userInfo = @{ MPDocumentEntryKey : newEntry };
   [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidAddEntryNotification object:self userInfo:userInfo];
@@ -322,7 +348,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   [group removeObjectFromGroupsAtIndex:index];
 }
 
-#pragma mark Private 
+#pragma mark Private
 - (void)_cleanupLock {
   if(_didLockFile) {
     [[NSFileManager defaultManager] removeItemAtURL:_lockFileURL error:nil];
diff --git a/MacPass/MPDocumentSettingsWindowController.m b/MacPass/MPDocumentSettingsWindowController.m
index f13586c3..c9f52dd8 100644
--- a/MacPass/MPDocumentSettingsWindowController.m
+++ b/MacPass/MPDocumentSettingsWindowController.m
@@ -10,6 +10,7 @@
 #import "MPDocument.h"
 #import "MPDatabaseVersion.h"
 #import "Kdb4Node.h"
+#import "Kdb4Tree+Undo.h"
 
 @interface MPDocumentSettingsWindowController () {
   MPDocument *_document;
@@ -36,14 +37,14 @@
   NSAssert(_document != nil, @"Document needs to be present");
   if( _document.version == MPDatabaseVersion4 ) {
     Kdb4Tree *tree = (Kdb4Tree *)_document.tree;
-    [self.databaseNameTextField bind:NSValueBinding toObject:tree withKeyPath:@"databaseName" options:nil];
-    [self.databaseDescriptionTextView bind:NSValueBinding toObject:tree withKeyPath:@"databaseDescription" options:nil];
+    [self.databaseNameTextField bind:NSValueBinding toObject:tree withKeyPath:MPTree4DatabaseNameUndoableKey options:nil];
+    [self.databaseDescriptionTextView bind:NSValueBinding toObject:tree withKeyPath:MPTree4DatabaseDescriptionUndoableKey options:nil];
     
-    [self.protectNotesCheckButton bind:NSValueBinding toObject:tree withKeyPath:@"protectNotes" options:nil];
-    [self.protectPasswortCheckButton bind:NSValueBinding toObject:tree withKeyPath:@"protectPassword" options:nil];
-    [self.protectTitleCheckButton bind:NSValueBinding toObject:tree withKeyPath:@"protectTitle" options:nil];
-    [self.protectURLCheckButton bind:NSValueBinding toObject:tree withKeyPath:@"protectUrl" options:nil];
-    [self.protectUserNameCheckButton bind:NSValueBinding toObject:tree withKeyPath:@"protectUserName" options:nil];
+    [self.protectNotesCheckButton bind:NSValueBinding toObject:tree withKeyPath:MPTree4ProtectNotesUndoableKey options:nil];
+    [self.protectPasswortCheckButton bind:NSValueBinding toObject:tree withKeyPath:MPTree4ProtectPasswordUndoableKey options:nil];
+    [self.protectTitleCheckButton bind:NSValueBinding toObject:tree withKeyPath:MPTree4ProtectTitleUndoableKey options:nil];
+    [self.protectURLCheckButton bind:NSValueBinding toObject:tree withKeyPath:MPTree4ProtectUrlUndoableKey options:nil];
+    [self.protectUserNameCheckButton bind:NSValueBinding toObject:tree withKeyPath:MPTree4ProtectUsernameUndoableKey options:nil];
   }
   else {
     // Switch to KdbV3 View
diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h
index 8f19b4c7..9a3b3713 100644
--- a/MacPass/MPInspectorViewController.h
+++ b/MacPass/MPInspectorViewController.h
@@ -29,6 +29,7 @@
 @property (assign) IBOutlet NSTextField *modifiedTextField;
 @property (assign) IBOutlet NSSegmentedControl *infoTabControl;
 @property (assign) IBOutlet NSTableView *attachmentTableView;
+@property (assign) IBOutlet NSTableView *customFieldsTableView;
 @property (assign) IBOutlet NSTextView *notesTextView;
 @property (assign) IBOutlet NSTextField *customFieldsTextField;
 
diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index 63f61313..03e36d2a 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -17,12 +17,15 @@
 #import "MPOutlineViewController.h"
 #import "MPDocument.h"
 #import "MPCustomFieldView.h"
+#import "MPDatabaseVersion.h"
+#import "MPCustomFieldTableCellView.h"
 
 #import "KdbLib.h"
 #import "Kdb4Node.h"
 #import "Kdb3Node.h"
 #import "KdbGroup+Undo.h"
 #import "KdbEntry+Undo.h"
+#import "Kdb4Entry+KVOAdditions.h"
 #import "NSMutableData+Base64.h"
 
 #import "HNHGradientView.h"
@@ -50,7 +53,7 @@ enum {
 @property (nonatomic, assign) NSUInteger activeTab;
 @property (assign) IBOutlet NSTabView *tabView;
 @property (retain) NSArrayController *attachmentsController;
-@property (retain) NSMutableArray *customFieldViews;
+@property (retain) NSArrayController *customFieldsController;
 
 - (IBAction)addCustomField:(id)sender;
 - (IBAction)removeCustomField:(id)sender;
@@ -69,8 +72,8 @@ enum {
     _selectedEntry = nil;
     _selectedGroup = nil;
     _attachmentsController = [[NSArrayController alloc] init];
+    _customFieldsController = [[NSArrayController alloc] init];
     _activeTab = MPGeneralTab;
-    _customFieldViews = [[NSMutableArray alloc] initWithCapacity:5];
   }
   return self;
 }
@@ -79,7 +82,7 @@ enum {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [_activePopover release];
   [_attachmentsController release];
-  [_customFieldViews release];
+  [_customFieldsController release];
   [super dealloc];
 }
 
@@ -94,6 +97,8 @@ enum {
   
   [_attachmentTableView bind:NSContentBinding toObject:self.attachmentsController withKeyPath:@"arrangedObjects" options:nil];
   [_attachmentTableView setDelegate:self];
+  [_customFieldsTableView bind:NSContentBinding toObject:self.customFieldsController withKeyPath:@"arrangedObjects" options:nil];
+  [_customFieldsTableView setDelegate:self];
   
   [self _clearContent];
 }
@@ -135,6 +140,7 @@ enum {
     [self _clearContent];
   }
   [self _updateAttachments];
+  [self _updateCustomFields];
 }
 
 - (void)_updateAttachments {
@@ -143,16 +149,24 @@ enum {
       [self.attachmentsController bind:NSContentArrayBinding toObject:self.selectedEntry withKeyPath:@"binaries" options:nil];
     }
     else {
-      /* Use binarydes and binary form Kdb3Entry */
+      /* Use binary from Kdb3Entry */
     }
   }
   else if([self.attachmentsController content] != nil){
-    
     [self.attachmentsController unbind:NSContentArrayBinding];
     [self.attachmentsController setContent:nil];
     
   }
-  
+}
+
+- (void)_updateCustomFields {
+  if(self.selectedEntry && [self.selectedEntry isKindOfClass:[Kdb4Entry class]]) {
+    [self.customFieldsController bind:NSContentArrayBinding toObject:self.selectedEntry withKeyPath:@"stringFields" options:nil];
+  }
+  else if([self.customFieldsController content] != nil){
+    [self.customFieldsController unbind:NSContentArrayBinding];
+    [self.customFieldsController setContent:nil];
+  }
 }
 
 - (void)_showEntry {
@@ -239,8 +253,10 @@ enum {
   [self.URLTextField setEnabled:enabled];
   [self.generatePasswordButton setEnabled:enabled];
   
-  [self.infoTabControl setEnabled:enabled forSegment:MPAttachmentsTab];
   [self.infoTabControl setEnabled:enabled forSegment:MPNotesTab];
+  [self.infoTabControl setEnabled:enabled forSegment:MPAttachmentsTab];
+
+  enabled &= [self.selectedEntry isKindOfClass:[Kdb4Entry class]];
   [self.infoTabControl setEnabled:enabled forSegment:MPCustomFieldsTab];
 }
 
@@ -287,68 +303,14 @@ enum {
 
 #pragma mark Actions
 - (IBAction)addCustomField:(id)sender {
-  NSArray *topLevelObjects;
-  BOOL success = [[NSBundle mainBundle] loadNibNamed:@"CustomFieldView" owner:self topLevelObjects:&topLevelObjects];
-  if(success) {
-    id object = [topLevelObjects lastObject];
-    MPCustomFieldView *fieldView;
-    if(![object isKindOfClass:[MPCustomFieldView class]]) {
-      fieldView = topLevelObjects[0];
-    }
-    else {
-      fieldView = object;
-    }
-    [fieldView.deleteButton setTarget:self];
-    NSTabViewItem *tabViewItem = [self.tabView tabViewItemAtIndex:MPCustomFieldsTab];
-    
-    NSView *predecessorView = [self.customFieldViews lastObject];
-    if(!predecessorView) {
-      predecessorView = _customFieldsTextField;
-    }
-    
-    [[tabViewItem view] addSubview:fieldView];
-    [self.customFieldViews addObject:fieldView];
-    
-    NSDictionary *views = NSDictionaryOfVariableBindings(fieldView, predecessorView);
-    [[tabViewItem view] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-20-[fieldView]-20-|"
-                                                                               options:0
-                                                                               metrics:nil
-                                                                                 views:views]];
-    [[tabViewItem view] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[predecessorView]-10-[fieldView]"
-                                                                               options:0
-                                                                               metrics:nil
-                                                                                 views:views]];
-    [[tabViewItem view] layoutSubtreeIfNeeded];
-  }
+  Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
+  StringField *stringField = [StringField stringFieldWithKey:@"Key" andValue:@"Value"];
+  [entry insertObject:stringField inStringFieldsAtIndex:[entry.stringFields count]];
 }
 - (IBAction)removeCustomField:(id)sender {
-  NSControl *button = sender;
-  NSView *fieldView = [button superview];
-  
-  if([self.customFieldViews containsObject:fieldView]) {
-    [fieldView removeFromSuperview];
-    NSUInteger index = [self.customFieldViews indexOfObject:fieldView];
-    NSView *newPredecessorView = nil;
-    NSView *newSuccesorView = nil;
-    if(index == 0) {
-      newPredecessorView = _customFieldsTextField;
-    }
-    else {
-      NSAssert(index > 0, @"");
-      newPredecessorView = [self.customFieldViews objectAtIndex:index - 1];
-    }
-    NSTabViewItem *tabViewItem = [self.tabView tabViewItemAtIndex:MPCustomFieldsTab];
-    if(index < [self.customFieldViews count] - 1) {
-      newSuccesorView = [self.customFieldViews objectAtIndex:index + 1];
-      NSDictionary *views = NSDictionaryOfVariableBindings(newPredecessorView, newSuccesorView);
-      [[tabViewItem view] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[newPredecessorView]-10-[newSuccesorView]"
-                                                                                 options:0
-                                                                                 metrics:nil
-                                                                                   views:views]];
-    }
-    [self.customFieldViews removeObject:fieldView];
-    [[tabViewItem view] layoutSubtreeIfNeeded];
-  }
+  NSButton *button = sender;
+  Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
+  [entry removeObjectFromStringFieldsAtIndex:[button tag]];
 }
 
 #pragma mark Notificiations
@@ -373,7 +335,14 @@ enum {
 
 #pragma mark NSTableViewDelegate
 - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-  NSTableCellView *view = [tableView makeViewWithIdentifier:[tableColumn identifier] owner:tableView];
+  if(tableView == self.attachmentTableView) {
+    return [self _viewForAttachmentTableColumn:tableColumn row:row];
+  }
+  return [self _viewForCustomFieldTableColumn:tableColumn row:row];
+}
+
+- (NSView *)_viewForAttachmentTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+  NSTableCellView *view = [_attachmentTableView makeViewWithIdentifier:[tableColumn identifier] owner:_attachmentTableView];
   if([self.selectedEntry isKindOfClass:[Kdb4Entry class]]) {
     Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
     BinaryRef *binaryRef = entry.binaries[row];
@@ -384,4 +353,19 @@ enum {
   }
   return view;
 }
+- (NSView *)_viewForCustomFieldTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+  MPCustomFieldTableCellView *view = [_customFieldsTableView makeViewWithIdentifier:[tableColumn identifier] owner:_customFieldsTableView];
+  if([self.selectedEntry isKindOfClass:[Kdb4Entry class]]) {
+    Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
+    StringField *stringField = entry.stringFields[row];
+    [view.labelTextField bind:NSValueBinding toObject:stringField withKeyPath:@"key" options:nil];
+    [view.valueTextField bind:NSValueBinding toObject:stringField withKeyPath:@"value" options:nil];
+    [view.removeButton setTarget:self];
+    [view.removeButton setAction:@selector(removeCustomField:)];
+    [view.removeButton setTag:row];
+  }
+  return view;
+}
+
+
 @end
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index e68024ce..fab8894b 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1354</string>
+	<string>1407</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 9a3db7db8783b185575e177c9668222f2b84c0a2..f08f5a9eedce50745d79543e0bff8ebdddf08f60 100644
GIT binary patch
delta 373
zcmZvYO-chn5QRSoA_^i-6qFDc2C`5WL)H@TXCfp>5=^p|8K>2tP9!mF&mg^V>kR}?
z;ND9JIf$=&5kx{$R9E+--dFW@_#J;72Ngrkh-X6OR5>M6OfiJEQLb$!oG?(FD*80-
z*XquG;+2NNYYXnBF7)>3bI4p(uKUEkZ&%`F4!*zFOu1$vf+u;87*p78P<{F5$`uJs
z`JZt~i=K#Dbm<U@yP=5m@8~m6;3jZXu5$hF<Y3f2W2X08=@*2mBaT?ti8)~C$;Z2r
z{KYohsO5|YTQAo)9Ll-YG30`QeO;+;_5I@9(5b9)GW%27TU(fD4Ykj9&?)@_VDm~^

delta 16
XcmX@3KSO(igV5v;VqBZ+MEsZmIhO_c

diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index b8d40af431bebb337a7b0c082d9c43b0bcbdfc7a..1c552d5a28621abb8519997674c7ea583e5b2bb5 100644
GIT binary patch
delta 298
zcmeyRIZ1EBH$ll%h7^WOh7tw^Ae{)L6B&|#xR@bz@^3+PeisHuh7cfj0^(o>*U9oi
z@<1_Eb=E@4`q)eXngKR76=+&ALlMxH0-*Vs4EYRslk<gS)zQpmh-YwNa0S}p%n-!j
z$q)dv*OS4Y!EZ9ZuxK#EPN>U(rn&&l#xRv3ok5Agnt=-l^%=AnLK*Uae#!@`Ms{5)
pLmJTir3^Wf&kGrHgKTsI`Yn{fXYy|$O&}j3FE4Dm`Jdn)CIAw$JyQSx

delta 12
TcmbQF_e*obH^I$(A}q`RB(Vf{