diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 646ca00f..2ae6688e 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -66,7 +66,7 @@
 							<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
 							<string>NeXT TIFF v4.0 pasteboard type</string>
 						</set>
-						<string key="NSFrame">{{20, 514}, {48, 48}}</string>
+						<string key="NSFrame">{{20, 461}, {48, 48}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="787130496"/>
@@ -91,7 +91,7 @@
 					<object class="NSTextField" id="787130496">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{73, 530}, {209, 17}}</string>
+						<string key="NSFrame">{{73, 477}, {209, 17}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="166081160"/>
@@ -144,7 +144,7 @@
 					<object class="NSSegmentedControl" id="894571713">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{73, 482}, {154, 25}}</string>
+						<string key="NSFrame">{{73, 429}, {154, 25}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="816254670"/>
@@ -175,7 +175,7 @@
 					<object class="NSTabView" id="166081160">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">12</int>
-						<string key="NSFrame">{{0, 31}, {299, 452}}</string>
+						<string key="NSFrame">{{0, 31}, {299, 399}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="13134025"/>
@@ -190,7 +190,7 @@
 										<object class="NSTextField" id="734056912">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 418}, {35, 14}}</string>
+											<string key="NSFrame">{{17, 365}, {35, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="909883915"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -222,7 +222,7 @@
 										<object class="NSTextField" id="909883915">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 388}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 335}, {259, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="328122838"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -256,7 +256,7 @@
 										<object class="NSTextField" id="328122838">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 366}, {58, 14}}</string>
+											<string key="NSFrame">{{17, 313}, {58, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="800408621"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -276,7 +276,7 @@
 										<object class="NSTextField" id="800408621">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 336}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 283}, {259, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="428053603"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -297,7 +297,7 @@
 										<object class="NSTextField" id="484293743">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 285}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 231}, {259, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="279643156"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -318,7 +318,7 @@
 										<object class="NSTextField" id="428053603">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 315}, {25, 13}}</string>
+											<string key="NSFrame">{{17, 261}, {25, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="484293743"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -338,7 +338,7 @@
 										<object class="NSTextField" id="279643156">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 263}, {58, 14}}</string>
+											<string key="NSFrame">{{17, 209}, {58, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="25956638"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -358,7 +358,7 @@
 										<object class="NSTextField" id="25956638">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 233}, {259, 22}}</string>
+											<string key="NSFrame">{{20, 179}, {259, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="172507372"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -379,7 +379,7 @@
 										<object class="NSButton" id="172507372">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 206}, {259, 19}}</string>
+											<string key="NSFrame">{{20, 152}, {259, 19}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="451174458"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -408,7 +408,7 @@
 										<object class="NSTextField" id="451174458">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 185}, {42, 14}}</string>
+											<string key="NSFrame">{{17, 131}, {42, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
 											<reference key="NSNextKeyView" ref="889716404"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -428,9 +428,9 @@
 										<object class="NSLevelIndicator" id="889716404">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 159}, {259, 18}}</string>
+											<string key="NSFrame">{{20, 105}, {259, 18}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
-											<reference key="NSNextKeyView" ref="894571713"/>
+											<reference key="NSNextKeyView" ref="13391205"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSLevelIndicatorCell" key="NSCell" id="35468313">
@@ -446,8 +446,28 @@
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
+										<object class="NSTextField" id="13391205">
+											<reference key="NSNextResponder" ref="726109125"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{17, 20}, {46, 14}}</string>
+											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSNextKeyView"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="56118370">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272761856</int>
+												<string key="NSContents">Created</string>
+												<reference key="NSSupport" ref="26"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="13391205"/>
+												<reference key="NSBackgroundColor" ref="533509460"/>
+												<reference key="NSTextColor" ref="1062890562"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
 									</array>
-									<string key="NSFrameSize">{299, 452}</string>
+									<string key="NSFrameSize">{299, 399}</string>
 									<reference key="NSNextKeyView" ref="734056912"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 								</object>
@@ -590,7 +610,7 @@
 													<double key="NSPercent">0.99487179487179489</double>
 												</object>
 											</array>
-											<string key="NSFrame">{{20, 282}, {259, 125}}</string>
+											<string key="NSFrame">{{20, 229}, {259, 125}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="385885401"/>
@@ -634,7 +654,7 @@
 																<string>WebURLsWithTitlesPboardType</string>
 																<string>public.url</string>
 															</set>
-															<string key="NSFrameSize">{257, 201}</string>
+															<string key="NSFrameSize">{257, 148}</string>
 															<reference key="NSSuperview" ref="454120122"/>
 															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="942541726"/>
@@ -697,7 +717,7 @@
 															<nil key="NSDelegate"/>
 														</object>
 													</array>
-													<string key="NSFrame">{{1, 1}, {257, 201}}</string>
+													<string key="NSFrame">{{1, 1}, {257, 148}}</string>
 													<reference key="NSSuperview" ref="850153963"/>
 													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="569376381"/>
@@ -728,7 +748,7 @@
 												<object class="NSScroller" id="942541726">
 													<reference key="NSNextResponder" ref="850153963"/>
 													<int key="NSvFlags">256</int>
-													<string key="NSFrame">{{242, 1}, {16, 201}}</string>
+													<string key="NSFrame">{{242, 1}, {16, 148}}</string>
 													<reference key="NSSuperview" ref="850153963"/>
 													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="894571713"/>
@@ -755,7 +775,7 @@
 													<double key="NSPercent">0.94565218687057495</double>
 												</object>
 											</array>
-											<string key="NSFrame">{{20, 20}, {259, 203}}</string>
+											<string key="NSFrame">{{20, 20}, {259, 150}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="657519150"/>
@@ -771,7 +791,7 @@
 										<object class="NSTextField" id="1028562761">
 											<reference key="NSNextResponder" ref="13134025"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 415}, {79, 17}}</string>
+											<string key="NSFrame">{{17, 362}, {79, 17}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="994354248"/>
@@ -792,7 +812,7 @@
 										<object class="NSTextField" id="564843810">
 											<reference key="NSNextResponder" ref="13134025"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 231}, {35, 17}}</string>
+											<string key="NSFrame">{{17, 178}, {35, 17}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="850153963"/>
@@ -813,7 +833,7 @@
 										<object class="NSButton" id="394980328">
 											<reference key="NSNextResponder" ref="13134025"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{217, 255}, {62, 19}}</string>
+											<string key="NSFrame">{{217, 202}, {62, 19}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="564843810"/>
@@ -838,7 +858,7 @@
 										<object class="NSButton" id="445963820">
 											<reference key="NSNextResponder" ref="13134025"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{145, 255}, {64, 19}}</string>
+											<string key="NSFrame">{{145, 202}, {64, 19}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="394980328"/>
@@ -861,7 +881,7 @@
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrameSize">{299, 452}</string>
+									<string key="NSFrameSize">{299, 399}</string>
 									<reference key="NSSuperview" ref="166081160"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1028562761"/>
@@ -882,7 +902,7 @@
 						</array>
 					</object>
 				</array>
-				<string key="NSFrameSize">{299, 582}</string>
+				<string key="NSFrameSize">{299, 529}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1013751338"/>
@@ -1011,6 +1031,14 @@
 					</object>
 					<int key="connectionID">1556</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">infoTextField</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="13391205"/>
+					</object>
+					<int key="connectionID">1888</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">imageView</string>
@@ -1167,6 +1195,38 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="1004767307">
+								<reference key="firstItem" ref="894571713"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="166081160"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="87082330"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="802297198">
+								<reference key="firstItem" ref="894571713"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1013751338"/>
+								<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="87082330"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="92575844">
 								<reference key="firstItem" ref="166081160"/>
 								<int key="firstAttribute">3</int>
@@ -1231,38 +1291,6 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1004767307">
-								<reference key="firstItem" ref="894571713"/>
-								<int key="firstAttribute">9</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="166081160"/>
-								<int key="secondAttribute">9</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="87082330"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="802297198">
-								<reference key="firstItem" ref="894571713"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1013751338"/>
-								<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="87082330"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="579522466">
 								<reference key="firstItem" ref="87082330"/>
 								<int key="firstAttribute">6</int>
@@ -1798,7 +1826,55 @@
 						<int key="objectID">1397</int>
 						<reference key="object" ref="726109125"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="249851044">
+							<object class="IBNSLayoutConstraint" id="332393876">
+								<reference key="firstItem" ref="13391205"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">1</int>
+								<reference key="secondItem" ref="889716404"/>
+								<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="726109125"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="749193236">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="13391205"/>
+								<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="726109125"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="989194529">
+								<reference key="firstItem" ref="13391205"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</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>
+								</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>
 								<int key="relation">0</int>
@@ -1810,8 +1886,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="120829582">
@@ -1846,23 +1922,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="711495093">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">1</int>
-								<reference key="secondItem" ref="889716404"/>
-								<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="726109125"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="671374777">
+							<object class="IBNSLayoutConstraint" id="992431666">
 								<reference key="firstItem" ref="451174458"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -1874,8 +1934,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="345569903">
@@ -1894,7 +1954,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="493052360">
+							<object class="IBNSLayoutConstraint" id="574256349">
 								<reference key="firstItem" ref="172507372"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -1906,8 +1966,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="230041507">
@@ -1942,7 +2002,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="285881564">
+							<object class="IBNSLayoutConstraint" id="700884070">
 								<reference key="firstItem" ref="25956638"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -1954,8 +2014,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="798174181">
@@ -1990,7 +2050,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="635907464">
+							<object class="IBNSLayoutConstraint" id="502895567">
 								<reference key="firstItem" ref="279643156"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -2002,8 +2062,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="1058462363">
@@ -2022,7 +2082,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="147483457">
+							<object class="IBNSLayoutConstraint" id="922844847">
 								<reference key="firstItem" ref="484293743"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -2034,8 +2094,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="968824540">
@@ -2082,8 +2142,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="250345161">
@@ -2114,8 +2174,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="655376427">
@@ -2162,8 +2222,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="285556007">
@@ -2210,8 +2270,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="479844082">
@@ -2258,8 +2318,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="866470549">
@@ -2281,6 +2341,7 @@
 							<reference ref="909883915"/>
 							<reference ref="328122838"/>
 							<reference ref="800408621"/>
+							<reference ref="734056912"/>
 							<reference ref="428053603"/>
 							<reference ref="484293743"/>
 							<reference ref="279643156"/>
@@ -2288,7 +2349,7 @@
 							<reference ref="172507372"/>
 							<reference ref="451174458"/>
 							<reference ref="889716404"/>
-							<reference ref="734056912"/>
+							<reference ref="13391205"/>
 						</array>
 						<reference key="parent" ref="1002013291"/>
 					</object>
@@ -2377,22 +2438,6 @@
 						<reference key="object" ref="428053603"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="72248030"/>
-							<object class="IBNSLayoutConstraint" id="573406761">
-								<reference key="firstItem" ref="428053603"/>
-								<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">13</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="428053603"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
 						</array>
 						<reference key="parent" ref="726109125"/>
 					</object>
@@ -2896,11 +2941,6 @@
 						<reference key="object" ref="35468313"/>
 						<reference key="parent" ref="889716404"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1626</int>
-						<reference key="object" ref="711495093"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1665</int>
 						<reference key="object" ref="902687269"/>
@@ -2996,11 +3036,6 @@
 						<reference key="object" ref="120829582"/>
 						<reference key="parent" ref="726109125"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1824</int>
-						<reference key="object" ref="573406761"/>
-						<reference key="parent" ref="428053603"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1849</int>
 						<reference key="object" ref="496215318"/>
@@ -3026,36 +3061,6 @@
 						<reference key="object" ref="794358918"/>
 						<reference key="parent" ref="726109125"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1856</int>
-						<reference key="object" ref="147483457"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1858</int>
-						<reference key="object" ref="635907464"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1859</int>
-						<reference key="object" ref="285881564"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1860</int>
-						<reference key="object" ref="493052360"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1861</int>
-						<reference key="object" ref="671374777"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1862</int>
-						<reference key="object" ref="249851044"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1869</int>
 						<reference key="object" ref="105322693"/>
@@ -3097,7 +3102,65 @@
 						<reference key="parent" ref="13134025"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1883</int>
+						<int key="objectID">1898</int>
+						<reference key="object" ref="922844847"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1900</int>
+						<reference key="object" ref="502895567"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1901</int>
+						<reference key="object" ref="700884070"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1903</int>
+						<reference key="object" ref="574256349"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1904</int>
+						<reference key="object" ref="992431666"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1905</int>
+						<reference key="object" ref="98908673"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1884</int>
+						<reference key="object" ref="13391205"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="56118370"/>
+						</array>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1885</int>
+						<reference key="object" ref="56118370"/>
+						<reference key="parent" ref="13391205"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1910</int>
+						<reference key="object" ref="989194529"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1918</int>
+						<reference key="object" ref="749193236"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1919</int>
+						<reference key="object" ref="332393876"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1917</int>
 						<reference key="object" ref="127309281"/>
 						<reference key="parent" ref="13134025"/>
 					</object>
@@ -3123,9 +3186,6 @@
 				<string key="1235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="1236.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="1236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="1237.IBNSViewMetadataConstraints">
-					<reference ref="573406761"/>
-				</array>
 				<boolean value="NO" key="1237.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="1237.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="1238.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -3174,7 +3234,7 @@
 					<reference ref="392529850"/>
 				</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"/>
@@ -3190,21 +3250,23 @@
 					<reference ref="794358918"/>
 					<reference ref="902687269"/>
 					<reference ref="968824540"/>
-					<reference ref="147483457"/>
+					<reference ref="922844847"/>
 					<reference ref="1058462363"/>
-					<reference ref="635907464"/>
+					<reference ref="502895567"/>
 					<reference ref="928232729"/>
 					<reference ref="798174181"/>
-					<reference ref="285881564"/>
+					<reference ref="700884070"/>
 					<reference ref="833009099"/>
 					<reference ref="230041507"/>
-					<reference ref="493052360"/>
+					<reference ref="574256349"/>
 					<reference ref="345569903"/>
-					<reference ref="671374777"/>
-					<reference ref="711495093"/>
+					<reference ref="992431666"/>
 					<reference ref="307015338"/>
 					<reference ref="120829582"/>
-					<reference ref="249851044"/>
+					<reference ref="98908673"/>
+					<reference ref="989194529"/>
+					<reference ref="749193236"/>
+					<reference ref="332393876"/>
 				</array>
 				<string key="1397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3294,7 +3356,6 @@
 				<string key="1609.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1610.CustomClassName">HNHLevelIndicatorCell</string>
 				<string key="1610.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1626.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1665.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1672.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1697.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3315,18 +3376,11 @@
 				<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="1824.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>
 				<string key="1853.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1855.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1856.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1858.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1859.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1860.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1861.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1869.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1871.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1874.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3334,19 +3388,31 @@
 				<string key="1876.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1877.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1879.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1883.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="455.IBNSViewMetadataConstraints">
+				<boolean value="NO" key="1884.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="1884.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1885.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1898.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1900.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1901.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1903.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1904.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1905.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1910.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1917.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1918.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1919.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="455.IBNSViewMetadataConstraints">
 					<reference ref="222939184"/>
 					<reference ref="1058743908"/>
 					<reference ref="408064385"/>
 					<reference ref="26781143"/>
 					<reference ref="579522466"/>
-					<reference ref="802297198"/>
-					<reference ref="1004767307"/>
 					<reference ref="895763818"/>
 					<reference ref="7989516"/>
 					<reference ref="314156867"/>
 					<reference ref="92575844"/>
+					<reference ref="802297198"/>
+					<reference ref="1004767307"/>
 					<reference ref="112302846"/>
 					<reference ref="26385821"/>
 					<reference ref="299643577"/>
@@ -3381,7 +3447,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">1883</int>
+			<int key="maxID">1920</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/MacPass/KdbEntry+Undo.m b/MacPass/KdbEntry+Undo.m
index 07f04a6a..0be9b928 100644
--- a/MacPass/KdbEntry+Undo.m
+++ b/MacPass/KdbEntry+Undo.m
@@ -45,30 +45,35 @@ NSString *const MPEntryNotesUndoableKey = @"notesUndoable";
 - (void)setTitleUndoable:(NSString *)title {
   [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setTitleUndoable:) object:self.title];
   [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_TITLE", "Undo set title")];
+  [self setLastModificationTime:[NSDate date]];
   [self setTitle:title];
 }
 
 - (void)setUsernameUndoable:(NSString *)username {
   [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setUsernameUndoable:) object:self.username];
   [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_USERNAME", "Undo set username")];
+  [self setLastModificationTime:[NSDate date]];
   [self setUsername:username];
 }
 
 - (void)setPasswordUndoable:(NSString *)password {
   [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setPasswordUndoable:) object:self.password];
   [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_PASSWORT", "Undo set password")];
+  [self setLastModificationTime:[NSDate date]];
   [self setPassword:password];
 }
 
 - (void)setUrlUndoable:(NSString *)url {
   [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setUrlUndoable:) object:self.url];
   [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_URL", "Undo set URL")];
+  [self setLastModificationTime:[NSDate date]];
   [self setUrl:url];
 }
 
 - (void)setNotesUndoable:(NSString *)notes {
   [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setNotesUndoable:) object:self.notes];
   [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_NOTES", "Undo set notes")];
+  [self setLastModificationTime:[NSDate date]];
   [self setNotes:notes];
 }
 
diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index d3246750..75b64142 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -45,7 +45,7 @@ enum {
 @property (nonatomic, assign) NSDate *modificationDate;
 @property (nonatomic, assign) NSDate *creationDate;
 
-@property (assign) NSUInteger activeTab;
+@property (nonatomic, assign) NSUInteger activeTab;
 @property (assign) IBOutlet NSTabView *tabView;
 @property (retain) NSArrayController *attachmentsController;
 
@@ -102,7 +102,7 @@ enum {
 
 - (void)_updateInfoString {
   NSDate *modificationDate;
-  NSDate *creationDate;
+  NSDate *creationDate;  
   if(self.selectedEntry) {
     modificationDate = self.selectedEntry.lastModificationTime;
     creationDate = self.selectedEntry.creationTime;
@@ -111,7 +111,14 @@ enum {
     modificationDate = self.selectedGroup.lastModificationTime;
     creationDate = self.selectedGroup.creationTime;
   }
-  [self.infoTextField setStringValue:[NSString stringWithFormat:@"created: %@ modified: %@", creationDate, modificationDate]];
+  NSString *modificationString = [NSDateFormatter localizedStringFromDate:modificationDate
+                                                                dateStyle:NSDateFormatterShortStyle
+                                                                timeStyle:NSDateFormatterShortStyle];
+  NSString *creationString = [NSDateFormatter localizedStringFromDate:modificationDate
+                                                            dateStyle:NSDateFormatterShortStyle
+                                                            timeStyle:NSDateFormatterShortStyle];
+  
+  [self.infoTextField setStringValue:[NSString stringWithFormat:@"created: %@ modified: %@", creationString, modificationString]];
 }
 
 - (void)setModificationDate:(NSDate *)modificationDate {
@@ -190,9 +197,8 @@ enum {
   [self.usernameTextField setStringValue:@""];
   [self.URLTextField setStringValue:@""];
   
-  // Reste toggle
-  [self.infoTabControl setSelected:YES forSegment:MPGeneralTab];
-  [self.infoTabControl setSelected:NO forSegment:MPAdvancedTab];
+  // Reste toggle. Do not call setter on control or the bindings wont update
+  self.activeTab = MPGeneralTab;
   
   [self _setInputEnabled:YES];
 }
@@ -264,6 +270,7 @@ enum {
   /* We do not enable the button all the time, but it's wokring find this way */
   [self.generatePasswordButton setEnabled:YES];
   id controller = _activePopover.contentViewController;
+  /* Check for password wizzard */
   if([controller respondsToSelector:@selector(generatedPassword)]) {
     NSString *password = [controller generatedPassword];
     /* We should only use the password if there is actally one */
@@ -271,6 +278,8 @@ enum {
       [self.selectedEntry setPasswordUndoable:[controller generatedPassword]];
     }
   }
+  /* TODO: Check for Icon wizzard */
+  
   [_activePopover release];
   _activePopover = nil;
 }
@@ -294,6 +303,8 @@ enum {
   [self _updateContent];
 }
 
+
+#pragma mark NSTableViewDelegate
 - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
   NSTableCellView *view = [tableView makeViewWithIdentifier:[tableColumn identifier] owner:tableView];
   if([self.selectedEntry isKindOfClass:[Kdb4Entry class]]) {
diff --git a/MacPass/MPLockDaemon.m b/MacPass/MPLockDaemon.m
index fe4d9029..e9de529c 100644
--- a/MacPass/MPLockDaemon.m
+++ b/MacPass/MPLockDaemon.m
@@ -13,7 +13,7 @@
 NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPShouldLockDatabaseNotification";
 
 @interface MPLockDaemon () {
-  NSTimer *idleTimer;
+  NSTimer *idleCheckTimer;
 }
 
 @property (nonatomic,assign) BOOL lockOnSleep;
@@ -46,7 +46,13 @@ NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPSho
 
 - (void)dealloc
 {
+  /* Notifications */
   [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
+  
+  /* Timer */
+  [idleCheckTimer invalidate];
+  [idleCheckTimer release];
+  
   [super dealloc];
 }
 
@@ -67,10 +73,15 @@ NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPSho
   if(_idleLockTime != idleLockTime) {
     _idleLockTime = idleLockTime;
     if(_idleLockTime == 0) {
-      // disable
+      [idleCheckTimer invalidate];
+      [idleCheckTimer release];
+      idleCheckTimer = nil;
     }
     else {
-      // update timer
+      [idleCheckTimer invalidate];
+      [idleCheckTimer release];
+      idleCheckTimer = [[NSTimer timerWithTimeInterval:15 target:self selector:@selector(_checkIdleTime:) userInfo:nil repeats:YES] retain];
+      [[NSRunLoop mainRunLoop] addTimer:idleCheckTimer forMode:NSDefaultRunLoopMode];
     }
   }
 }
@@ -79,4 +90,11 @@ NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPSho
   [[NSApp delegate] lockAllDocuments];
 }
 
+- (void)_checkIdleTime:(NSTimer *)timer {
+  CFTimeInterval interval = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState,kCGAnyInputEventType);
+  if(interval >= _idleLockTime) {
+    [[NSApp delegate] lockAllDocuments];
+  }
+}
+
 @end
diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m
index 7f6719b2..d4b1587f 100644
--- a/MacPass/MPOutlineDataSource.m
+++ b/MacPass/MPOutlineDataSource.m
@@ -32,9 +32,14 @@
 - (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id<NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index {
   if(_draggedItem) {
     info.animatesToDestination = YES;
+    NSDragOperation oprationMask = NSDragOperationMove;
+    if([info draggingSourceOperationMask] == NSDragOperationCopy) {
+      oprationMask = NSDragOperationCopy;
+    }
+    
     KdbGroup *target = [item representedObject];
     if( target == nil) {
-      return NSDragOperationNone; // Draggin over root
+      return oprationMask; // Draggin over root
     }
     BOOL validTarget = YES;
     if( _draggedItem.parent == target ) {
@@ -42,7 +47,7 @@
       validTarget &= index != [_draggedItem.parent.groups indexOfObject:_draggedItem];
     }
     if( validTarget ) {
-      return NSDragOperationMove;
+      return oprationMask;
     }
   }
   NSPasteboard *pasteBoard = [info draggingPasteboard];
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 1e01031a..1a936f95 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>950</string>
+	<string>990</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>