diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index d6c82c7e..bc5c0351 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -18,6 +18,7 @@
 			<string>NSCustomView</string>
 			<string>NSImageCell</string>
 			<string>NSImageView</string>
+			<string>NSProgressIndicator</string>
 			<string>NSScrollView</string>
 			<string>NSScroller</string>
 			<string>NSTableCellView</string>
@@ -52,26 +53,36 @@
 						<reference key="NSNextResponder" ref="997686550"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSButton" id="59573687">
+							<object class="NSProgressIndicator" id="545113708">
 								<reference key="NSNextResponder" ref="488931024"/>
 								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{244, 5}, {50, 17}}</string>
+								<string key="NSFrame">{{593, 6}, {16, 16}}</string>
+								<reference key="NSSuperview" ref="488931024"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:945</string>
+								<int key="NSpiFlags">28938</int>
+								<double key="NSMaxValue">100</double>
+							</object>
+							<object class="NSButton" id="843279765">
+								<reference key="NSNextResponder" ref="488931024"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{198, 5}, {38, 17}}</string>
 								<reference key="NSSuperview" ref="488931024"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="613995671"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="498304869">
-									<int key="NSCellFlags">67108864</int>
+								<object class="NSButtonCell" key="NSCell" id="636015412">
+									<int key="NSCellFlags">-2080374784</int>
 									<int key="NSCellFlags2">134348800</int>
-									<string key="NSContents">Notes</string>
+									<string key="NSContents">URL</string>
 									<object class="NSFont" key="NSSupport" id="29">
 										<string key="NSName">LucidaGrande-Bold</string>
 										<double key="NSSize">12</double>
 										<int key="NSfFlags">16</int>
 									</object>
 									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="59573687"/>
+									<reference key="NSControlView" ref="843279765"/>
 									<int key="NSButtonFlags">-1232846848</int>
 									<int key="NSButtonFlags2">173</int>
 									<string key="NSAlternateContents"/>
@@ -81,47 +92,23 @@
 								</object>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
-							<object class="NSButton" id="914845652">
-								<reference key="NSNextResponder" ref="488931024"/>
-								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{198, 5}, {38, 17}}</string>
-								<reference key="NSSuperview" ref="488931024"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="59573687"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="668258978">
-									<int key="NSCellFlags">67108864</int>
-									<int key="NSCellFlags2">134348800</int>
-									<string key="NSContents">URL</string>
-									<reference key="NSSupport" ref="29"/>
-									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="914845652"/>
-									<int key="NSButtonFlags">-1232846848</int>
-									<int key="NSButtonFlags2">173</int>
-									<string key="NSAlternateContents"/>
-									<string key="NSKeyEquivalent"/>
-									<int key="NSPeriodicDelay">400</int>
-									<int key="NSPeriodicInterval">75</int>
-								</object>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-							</object>
-							<object class="NSButton" id="346875213">
+							<object class="NSButton" id="128247646">
 								<reference key="NSNextResponder" ref="488931024"/>
 								<int key="NSvFlags">268</int>
+								<array class="NSMutableArray" key="NSSubviews"/>
 								<string key="NSFrame">{{114, 5}, {76, 17}}</string>
 								<reference key="NSSuperview" ref="488931024"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="914845652"/>
+								<reference key="NSNextKeyView" ref="843279765"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="421681311">
-									<int key="NSCellFlags">67108864</int>
+								<object class="NSButtonCell" key="NSCell" id="822877443">
+									<int key="NSCellFlags">-2080374784</int>
 									<int key="NSCellFlags2">134348800</int>
 									<string key="NSContents">Username</string>
 									<reference key="NSSupport" ref="29"/>
 									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="346875213"/>
+									<reference key="NSControlView" ref="128247646"/>
 									<int key="NSButtonFlags">-1232846848</int>
 									<int key="NSButtonFlags2">173</int>
 									<string key="NSAlternateContents"/>
@@ -137,7 +124,7 @@
 								<string key="NSFrame">{{64, 5}, {42, 17}}</string>
 								<reference key="NSSuperview" ref="488931024"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="346875213"/>
+								<reference key="NSNextKeyView" ref="128247646"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="917963484">
@@ -198,7 +185,7 @@
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 450}, {610, 30}}</string>
+						<string key="NSFrame">{{0, 450}, {615, 30}}</string>
 						<reference key="NSSuperview" ref="997686550"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="238723868"/>
@@ -217,7 +204,7 @@
 										<reference key="NSNextResponder" ref="262664416"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews"/>
-										<string key="NSFrameSize">{610, 433}</string>
+										<string key="NSFrameSize">{615, 433}</string>
 										<reference key="NSSuperview" ref="262664416"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="788738248"/>
@@ -228,7 +215,7 @@
 										<object class="NSTableHeaderView" key="NSHeaderView" id="778100560">
 											<reference key="NSNextResponder" ref="737075944"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{610, 17}</string>
+											<string key="NSFrameSize">{615, 17}</string>
 											<reference key="NSSuperview" ref="737075944"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="262664416"/>
@@ -360,7 +347,7 @@
 											</object>
 											<object class="NSTableColumn" id="956759754">
 												<string key="NSIdentifier">URL Column</string>
-												<double key="NSWidth">239</double>
+												<double key="NSWidth">113.18359375</double>
 												<double key="NSMinWidth">10</double>
 												<double key="NSMaxWidth">3.4028234663852886e+38</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -385,6 +372,32 @@
 												<bool key="NSIsEditable">YES</bool>
 												<reference key="NSTableView" ref="528076956"/>
 											</object>
+											<object class="NSTableColumn" id="683421605">
+												<double key="NSWidth">128</double>
+												<double key="NSMinWidth">10</double>
+												<double key="NSMaxWidth">3.4028234663852886e+38</double>
+												<object class="NSTableHeaderCell" key="NSHeaderCell">
+													<int key="NSCellFlags">75497536</int>
+													<int key="NSCellFlags2">2048</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSBackgroundColor" ref="977063486"/>
+													<reference key="NSTextColor" ref="892439253"/>
+												</object>
+												<object class="NSTextFieldCell" key="NSDataCell" id="290719360">
+													<int key="NSCellFlags">337641536</int>
+													<int key="NSCellFlags2">2048</int>
+													<string key="NSContents">Text Cell</string>
+													<reference key="NSSupport" ref="454123306"/>
+													<reference key="NSControlView" ref="528076956"/>
+													<reference key="NSBackgroundColor" ref="136901388"/>
+													<reference key="NSTextColor" ref="847395763"/>
+												</object>
+												<int key="NSResizingMask">3</int>
+												<bool key="NSIsResizeable">YES</bool>
+												<bool key="NSIsEditable">YES</bool>
+												<reference key="NSTableView" ref="528076956"/>
+											</object>
 										</array>
 										<double key="NSIntercellSpacingWidth">3</double>
 										<double key="NSIntercellSpacingHeight">2</double>
@@ -410,7 +423,7 @@
 										<int key="NSTableViewGroupRowStyle">1</int>
 									</object>
 								</array>
-								<string key="NSFrame">{{0, 17}, {610, 433}}</string>
+								<string key="NSFrame">{{0, 17}, {615, 433}}</string>
 								<reference key="NSSuperview" ref="613995671"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="528076956"/>
@@ -436,7 +449,7 @@
 							<object class="NSScroller" id="802411427">
 								<reference key="NSNextResponder" ref="613995671"/>
 								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{0, 245}, {359, 16}}</string>
+								<string key="NSFrame">{{0, 434}, {619, 16}}</string>
 								<reference key="NSSuperview" ref="613995671"/>
 								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:60</string>
@@ -444,7 +457,7 @@
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="613995671"/>
 								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.98898071625344353</double>
+								<double key="NSPercent">0.9935794542536116</double>
 							</object>
 							<object class="NSClipView" id="737075944">
 								<reference key="NSNextResponder" ref="613995671"/>
@@ -452,7 +465,7 @@
 								<array class="NSMutableArray" key="NSSubviews">
 									<reference ref="778100560"/>
 								</array>
-								<string key="NSFrameSize">{610, 17}</string>
+								<string key="NSFrameSize">{615, 17}</string>
 								<reference key="NSSuperview" ref="613995671"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="778100560"/>
@@ -462,7 +475,7 @@
 								<int key="NScvFlags">4</int>
 							</object>
 						</array>
-						<string key="NSFrameSize">{610, 450}</string>
+						<string key="NSFrameSize">{615, 450}</string>
 						<reference key="NSSuperview" ref="997686550"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="737075944"/>
@@ -478,7 +491,7 @@
 						<double key="NSMagnification">1</double>
 					</object>
 				</array>
-				<string key="NSFrameSize">{610, 480}</string>
+				<string key="NSFrameSize">{615, 480}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="488931024"/>
@@ -574,6 +587,62 @@
 					</object>
 					<int key="connectionID">577</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">searchTitleButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="486078330"/>
+					</object>
+					<int key="connectionID">605</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">searchURLButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="843279765"/>
+					</object>
+					<int key="connectionID">609</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">searchUsernameButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="128247646"/>
+					</object>
+					<int key="connectionID">610</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleFilterSpace:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="486078330"/>
+					</object>
+					<int key="connectionID">611</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleFilterSpace:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="128247646"/>
+					</object>
+					<int key="connectionID">612</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleFilterSpace:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="843279765"/>
+					</object>
+					<int key="connectionID">613</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">progressIndicator</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="545113708"/>
+					</object>
+					<int key="connectionID">626</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField</string>
@@ -618,6 +687,7 @@
 								<object class="NSImageView" id="591921532">
 									<reference key="NSNextResponder" ref="804102913"/>
 									<int key="NSvFlags">268</int>
+									<array class="NSMutableArray" key="NSSubviews"/>
 									<set class="NSMutableSet" key="NSDragTypes">
 										<string>Apple PDF pasteboard type</string>
 										<string>Apple PICT pasteboard type</string>
@@ -695,9 +765,9 @@
 								<object class="NSTextField" id="441850286">
 									<reference key="NSNextResponder" ref="542633869"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrameSize">{239, 17}</string>
+									<string key="NSFrameSize">{113, 17}</string>
 									<reference key="NSSuperview" ref="542633869"/>
-									<reference key="NSNextKeyView" ref="1037276411"/>
+									<reference key="NSNextKeyView" ref="954630866"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSTextFieldCell" key="NSCell" id="962724349">
@@ -712,7 +782,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{369, 1}, {239, 17}}</string>
+							<string key="NSFrame">{{369, 1}, {113, 17}}</string>
 							<reference key="NSNextKeyView" ref="441850286"/>
 						</object>
 						<reference key="destination" ref="441850286"/>
@@ -753,6 +823,40 @@
 					</object>
 					<int key="connectionID">431</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">textField</string>
+						<object class="NSTableCellView" key="source" id="954630866">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSTextField" id="488604658">
+									<reference key="NSNextResponder" ref="954630866"/>
+									<int key="NSvFlags">266</int>
+									<string key="NSFrameSize">{128, 17}</string>
+									<reference key="NSSuperview" ref="954630866"/>
+									<reference key="NSNextKeyView" ref="1037276411"/>
+									<string key="NSAntiCompressionPriority">{250, 750}</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="220947856">
+										<int key="NSCellFlags">67108928</int>
+										<int key="NSCellFlags2">272631808</int>
+										<string key="NSContents">Table View Cell</string>
+										<reference key="NSSupport" ref="454123306"/>
+										<reference key="NSControlView" ref="488604658"/>
+										<reference key="NSBackgroundColor" ref="10074991"/>
+										<reference key="NSTextColor" ref="847395763"/>
+									</object>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								</object>
+							</array>
+							<string key="NSFrame">{{485, 1}, {128, 17}}</string>
+							<reference key="NSNextKeyView" ref="488604658"/>
+						</object>
+						<reference key="destination" ref="488604658"/>
+					</object>
+					<int key="connectionID">619</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -875,15 +979,31 @@
 						<int key="objectID">349</int>
 						<reference key="object" ref="488931024"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="330269555">
-								<reference key="firstItem" ref="59573687"/>
+							<object class="IBNSLayoutConstraint" id="525834995">
+								<reference key="firstItem" ref="545113708"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="488931024"/>
+								<reference key="secondItem" ref="843279765"/>
 								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">8</double>
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="488931024"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="573562865">
+								<reference key="firstItem" ref="488931024"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="545113708"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">6</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="488931024"/>
@@ -891,11 +1011,43 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="477587411">
-								<reference key="firstItem" ref="59573687"/>
+							<object class="IBNSLayoutConstraint" id="568004410">
+								<reference key="firstItem" ref="843279765"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="128247646"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="488931024"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="381879542">
+								<reference key="firstItem" ref="843279765"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="914845652"/>
+								<reference key="secondItem" ref="128247646"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="488931024"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="616715528">
+								<reference key="firstItem" ref="128247646"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="486078330"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -908,10 +1060,10 @@
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="582205783">
-								<reference key="firstItem" ref="59573687"/>
+								<reference key="firstItem" ref="128247646"/>
 								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="914845652"/>
+								<reference key="secondItem" ref="486078330"/>
 								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -923,40 +1075,8 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="398918094">
-								<reference key="firstItem" ref="914845652"/>
-								<int key="firstAttribute">11</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="346875213"/>
-								<int key="secondAttribute">11</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="488931024"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="40326394">
-								<reference key="firstItem" ref="914845652"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="346875213"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="488931024"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="478255548">
-								<reference key="firstItem" ref="914845652"/>
+							<object class="IBNSLayoutConstraint" id="785089475">
+								<reference key="firstItem" ref="486078330"/>
 								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="238723868"/>
@@ -971,38 +1091,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="860240288">
-								<reference key="firstItem" ref="346875213"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="486078330"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="488931024"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="93247059">
-								<reference key="firstItem" ref="346875213"/>
-								<int key="firstAttribute">11</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="486078330"/>
-								<int key="secondAttribute">11</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="488931024"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="597009469">
 								<reference key="firstItem" ref="486078330"/>
 								<int key="firstAttribute">5</int>
@@ -1019,6 +1107,22 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="354263880">
+								<reference key="firstItem" ref="238723868"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="488931024"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="488931024"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="906997605">
 								<reference key="firstItem" ref="238723868"/>
 								<int key="firstAttribute">5</int>
@@ -1053,9 +1157,9 @@
 							</object>
 							<reference ref="238723868"/>
 							<reference ref="486078330"/>
-							<reference ref="346875213"/>
-							<reference ref="914845652"/>
-							<reference ref="59573687"/>
+							<reference ref="128247646"/>
+							<reference ref="843279765"/>
+							<reference ref="545113708"/>
 						</array>
 						<reference key="parent" ref="997686550"/>
 					</object>
@@ -1106,6 +1210,7 @@
 							<reference ref="673679325"/>
 							<reference ref="203082423"/>
 							<reference ref="956759754"/>
+							<reference ref="683421605"/>
 						</array>
 						<reference key="parent" ref="613995671"/>
 					</object>
@@ -1653,45 +1758,6 @@
 						<reference key="object" ref="917963484"/>
 						<reference key="parent" ref="486078330"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">447</int>
-						<reference key="object" ref="346875213"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="421681311"/>
-						</array>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">448</int>
-						<reference key="object" ref="421681311"/>
-						<reference key="parent" ref="346875213"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">452</int>
-						<reference key="object" ref="914845652"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="668258978"/>
-						</array>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">453</int>
-						<reference key="object" ref="668258978"/>
-						<reference key="parent" ref="914845652"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">456</int>
-						<reference key="object" ref="59573687"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="498304869"/>
-						</array>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">457</int>
-						<reference key="object" ref="498304869"/>
-						<reference key="parent" ref="59573687"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">478</int>
 						<reference key="object" ref="906997605"/>
@@ -1702,46 +1768,6 @@
 						<reference key="object" ref="597009469"/>
 						<reference key="parent" ref="488931024"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="93247059"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="860240288"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">495</int>
-						<reference key="object" ref="478255548"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">496</int>
-						<reference key="object" ref="40326394"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">497</int>
-						<reference key="object" ref="398918094"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">500</int>
-						<reference key="object" ref="582205783"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">501</int>
-						<reference key="object" ref="477587411"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">502</int>
-						<reference key="object" ref="330269555"/>
-						<reference key="parent" ref="488931024"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">344</int>
 						<reference key="object" ref="67428983"/>
@@ -1762,6 +1788,175 @@
 						<reference key="object" ref="805657812"/>
 						<reference key="parent" ref="997686550"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">581</int>
+						<reference key="object" ref="354263880"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">582</int>
+						<reference key="object" ref="785089475"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">594</int>
+						<reference key="object" ref="128247646"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="822877443"/>
+						</array>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">595</int>
+						<reference key="object" ref="822877443"/>
+						<reference key="parent" ref="128247646"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">597</int>
+						<reference key="object" ref="582205783"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">598</int>
+						<reference key="object" ref="616715528"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">599</int>
+						<reference key="object" ref="843279765"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="636015412"/>
+						</array>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">600</int>
+						<reference key="object" ref="636015412"/>
+						<reference key="parent" ref="843279765"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">601</int>
+						<reference key="object" ref="381879542"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">602</int>
+						<reference key="object" ref="568004410"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">614</int>
+						<reference key="object" ref="683421605"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="290719360"/>
+							<reference ref="954630866"/>
+						</array>
+						<reference key="parent" ref="528076956"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">615</int>
+						<reference key="object" ref="290719360"/>
+						<reference key="parent" ref="683421605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">616</int>
+						<reference key="object" ref="954630866"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="488604658"/>
+							<object class="IBNSLayoutConstraint" id="55280177">
+								<reference key="firstItem" ref="488604658"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="954630866"/>
+								<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="954630866"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="843799871">
+								<reference key="firstItem" ref="488604658"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="954630866"/>
+								<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="954630866"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="195790804">
+								<reference key="firstItem" ref="954630866"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="488604658"/>
+								<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="954630866"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+						</array>
+						<reference key="parent" ref="683421605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">617</int>
+						<reference key="object" ref="488604658"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="220947856"/>
+						</array>
+						<reference key="parent" ref="954630866"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">618</int>
+						<reference key="object" ref="220947856"/>
+						<reference key="parent" ref="488604658"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">620</int>
+						<reference key="object" ref="195790804"/>
+						<reference key="parent" ref="954630866"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">621</int>
+						<reference key="object" ref="843799871"/>
+						<reference key="parent" ref="954630866"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">622</int>
+						<reference key="object" ref="55280177"/>
+						<reference key="parent" ref="954630866"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">623</int>
+						<reference key="object" ref="545113708"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">624</int>
+						<reference key="object" ref="573562865"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">625</int>
+						<reference key="object" ref="525834995"/>
+						<reference key="parent" ref="488931024"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1841,18 +2036,18 @@
 				<string key="344.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="349.IBNSViewMetadataConstraints">
+				<array key="349.IBNSViewMetadataConstraints">
 					<reference ref="471309934"/>
 					<reference ref="906997605"/>
+					<reference ref="354263880"/>
 					<reference ref="597009469"/>
-					<reference ref="93247059"/>
-					<reference ref="860240288"/>
-					<reference ref="478255548"/>
-					<reference ref="40326394"/>
-					<reference ref="398918094"/>
+					<reference ref="785089475"/>
 					<reference ref="582205783"/>
-					<reference ref="477587411"/>
-					<reference ref="330269555"/>
+					<reference ref="616715528"/>
+					<reference ref="381879542"/>
+					<reference ref="568004410"/>
+					<reference ref="573562865"/>
+					<reference ref="525834995"/>
 				</array>
 				<boolean value="NO" key="349.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1903,25 +2098,8 @@
 				<boolean value="NO" key="442.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="442.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="443.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="447.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="448.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="452.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="456.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="484.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="495.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="496.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="497.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="500.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="501.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="502.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="54.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1932,21 +2110,70 @@
 				<string key="572.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="576.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="581.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="582.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="594.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="594.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="595.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="597.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="598.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="599.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="600.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="601.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="602.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="614.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="614.isInViewBasedMode"/>
+				<array key="614.prototypeCellViews">
+					<reference ref="954630866"/>
+				</array>
+				<string key="615.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="616.IBNSViewMetadataConstraints">
+					<reference ref="195790804"/>
+					<reference ref="843799871"/>
+					<reference ref="55280177"/>
+				</array>
+				<string key="616.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="617.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="617.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="618.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="620.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="621.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="622.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="623.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="623.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="624.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="625.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">579</int>
+			<int key="maxID">626</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">MPEntryViewController</string>
 					<string key="superclassName">MPViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">toggleFilterSpace:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">toggleFilterSpace:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">toggleFilterSpace:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="entryTable">NSTableView</string>
+						<string key="progressIndicator">NSProgressIndicator</string>
 						<string key="searchLabelTextField">NSTextField</string>
+						<string key="searchTitleButton">NSButton</string>
+						<string key="searchURLButton">NSButton</string>
+						<string key="searchUsernameButton">NSButton</string>
 						<string key="statusBar">NSView</string>
 						<string key="statusBarToTop">NSLayoutConstraint</string>
 						<string key="tableToTop">NSLayoutConstraint</string>
@@ -1956,10 +2183,26 @@
 							<string key="name">entryTable</string>
 							<string key="candidateClassName">NSTableView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="progressIndicator">
+							<string key="name">progressIndicator</string>
+							<string key="candidateClassName">NSProgressIndicator</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="searchLabelTextField">
 							<string key="name">searchLabelTextField</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="searchTitleButton">
+							<string key="name">searchTitleButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="searchURLButton">
+							<string key="name">searchURLButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="searchUsernameButton">
+							<string key="name">searchUsernameButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="statusBar">
 							<string key="name">statusBar</string>
 							<string key="candidateClassName">NSView</string>
diff --git a/MacPass/GeneralSettings.xib b/MacPass/GeneralSettings.xib
index ad1d39ac..a49d9f9d 100644
--- a/MacPass/GeneralSettings.xib
+++ b/MacPass/GeneralSettings.xib
@@ -18,6 +18,7 @@
 			<string>NSMenuItem</string>
 			<string>NSPopUpButton</string>
 			<string>NSPopUpButtonCell</string>
+			<string>NSProgressIndicator</string>
 			<string>NSTextField</string>
 			<string>NSTextFieldCell</string>
 		</array>
@@ -42,23 +43,21 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSCustomView" id="1025687547">
+					<object class="NSProgressIndicator" id="50535275">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{20, 20}, {250, 137}}</string>
+						<string key="NSFrame">{{129, 93}, {32, 32}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<string key="NSClassName">MPGradientView</string>
+						<string key="NSReuseIdentifierKey">_NS:945</string>
+						<int key="NSpiFlags">20490</int>
+						<double key="NSMaxValue">100</double>
 					</object>
 					<object class="NSPopUpButton" id="421904700">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{146, 174}, {127, 26}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="1025687547"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSAntiCompressionPriority">{750, 751}</string>
 						<bool key="NSEnabled">YES</bool>
@@ -138,7 +137,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 180}, {127, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="421904700"/>
 						<string key="NSReuseIdentifierKey">_NS:1505</string>
 						<bool key="NSEnabled">YES</bool>
@@ -173,7 +171,6 @@
 				</array>
 				<string key="NSFrameSize">{290, 218}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="637214120"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -196,6 +193,14 @@
 					</object>
 					<int key="connectionID">83</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">spinner</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="50535275"/>
+					</object>
+					<int key="connectionID">174</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -229,6 +234,38 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="421904700"/>
 							<reference ref="637214120"/>
+							<object class="IBNSLayoutConstraint" id="946623256">
+								<reference key="firstItem" ref="50535275"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="113642326">
+								<reference key="firstItem" ref="50535275"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<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="1005"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="835508122">
 								<reference key="firstItem" ref="421904700"/>
 								<int key="firstAttribute">11</int>
@@ -309,70 +346,6 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="750377732">
-								<reference key="firstItem" ref="1005"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1025687547"/>
-								<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="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="763066747">
-								<reference key="firstItem" ref="1005"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1025687547"/>
-								<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="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="465685960">
-								<reference key="firstItem" ref="1025687547"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1005"/>
-								<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="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="428150913">
-								<reference key="firstItem" ref="1025687547"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="421904700"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="689515169">
 								<reference key="firstItem" ref="637214120"/>
 								<int key="firstAttribute">7</int>
@@ -421,7 +394,7 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<reference ref="1025687547"/>
+							<reference ref="50535275"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -520,28 +493,18 @@
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="1025687547"/>
+						<int key="objectID">155</int>
+						<reference key="object" ref="50535275"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">148</int>
-						<reference key="object" ref="428150913"/>
+						<int key="objectID">168</int>
+						<reference key="object" ref="946623256"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">151</int>
-						<reference key="object" ref="465685960"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">152</int>
-						<reference key="object" ref="763066747"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">154</int>
-						<reference key="object" ref="750377732"/>
+						<int key="objectID">167</int>
+						<reference key="object" ref="113642326"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 				</array>
@@ -554,15 +517,13 @@
 					<reference ref="180695068"/>
 					<reference ref="989429017"/>
 					<reference ref="689515169"/>
-					<reference ref="428150913"/>
-					<reference ref="465685960"/>
-					<reference ref="763066747"/>
-					<reference ref="750377732"/>
 					<reference ref="704304955"/>
 					<reference ref="106372279"/>
 					<reference ref="850330857"/>
 					<reference ref="215335887"/>
 					<reference ref="835508122"/>
+					<reference ref="113642326"/>
+					<reference ref="946623256"/>
 				</array>
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -571,14 +532,12 @@
 				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="14.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="143.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="155.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="168.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -594,47 +553,9 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">154</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">MPGeneralSettingsController</string>
-					<string key="superclassName">NSViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">encodingPopup</string>
-						<string key="NS.object.0">NSPopUpButton</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">encodingPopup</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">encodingPopup</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MPGeneralSettingsController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MPGradientView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MPGradientView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
-			</array>
+			<int key="maxID">174</int>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/MacPass/MPEntryViewController.h b/MacPass/MPEntryViewController.h
index 05f14ca0..523c429c 100644
--- a/MacPass/MPEntryViewController.h
+++ b/MacPass/MPEntryViewController.h
@@ -12,6 +12,7 @@ APPKIT_EXTERN NSString *const MPEntryTableUserNameColumnIdentifier;
 APPKIT_EXTERN NSString *const MPEntryTableTitleColumnIdentifier;
 APPKIT_EXTERN NSString *const MPEntryTablePasswordColumnIdentifier;
 APPKIT_EXTERN NSString *const MPEntryTableParentColumnIdentifier;
+APPKIT_EXTERN NSString *const MPEntryTableURLColumnIdentifier;
 
 
 @class KdbGroup;
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index bbc9549f..29e269fb 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -17,15 +17,27 @@
 
 #define STATUS_BAR_ANIMATION_TIME 0.2
 
+typedef enum {
+  MPFilterNone = 0,
+  MPFilterUrls = 2,
+  MPFilterUsernames = 4,
+  MPFilterTitles = 8,
+} MPFilterModeType;
+
 NSString *const MPEntryTableUserNameColumnIdentifier = @"MPUserNameColumnIdentifier";
 NSString *const MPEntryTableTitleColumnIdentifier = @"MPTitleColumnIdentifier";
 NSString *const MPEntryTablePasswordColumnIdentifier = @"MPPasswordColumnIdentifier";
 NSString *const MPEntryTableParentColumnIdentifier = @"MPParentColumnIdentifier";
+NSString *const MPEntryTableURLColumnIdentifier = @"MPEntryTableURLColumnIdentifier";
 
 NSString *const _MPTableImageCellView = @"ImageCell";
 NSString *const _MPTableStringCellView = @"StringCell";
 NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 
+NSString *const _toggleSearchURLButton = @"SearchURL";
+NSString *const _toggleSearchTitleButton = @"SearchTitle";
+NSString *const _toggleSearchUsernameButton = @"SearchUsername";
+
 @interface MPEntryViewController ()
 
 @property (retain) NSArrayController *entryArrayController;
@@ -36,7 +48,20 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 @property (assign) BOOL isStatusBarVisible;
 @property (retain) IBOutlet NSLayoutConstraint *statusBarToTop;
 @property (retain) IBOutlet NSLayoutConstraint *tableToTop;
+@property (assign) IBOutlet NSProgressIndicator *progressIndicator;
 
+@property (assign) IBOutlet NSButton *searchTitleButton;
+@property (assign) IBOutlet NSButton *searchUsernameButton;
+@property (assign) IBOutlet NSButton *searchURLButton;
+
+@property (assign, nonatomic) MPFilterModeType filterMode;
+@property (retain, nonatomic) NSDictionary *filterButtonToMode;
+
+- (IBAction)toggleFilterSpace:(id)sender;
+
+- (BOOL)shouldFilterURLs;
+- (BOOL)shouldFilterTitles;
+- (BOOL)shouldFilterUsernames;
 
 - (BOOL)hasFilter;
 - (void)updateFilter;
@@ -57,6 +82,11 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
   if(self) {
     _isStatusBarVisible = YES;
+    _filterMode = MPFilterTitles;
+    _filterButtonToMode = [@{ _toggleSearchUsernameButton : @(MPFilterUsernames),
+                           _toggleSearchTitleButton : @(MPFilterTitles),
+                           _toggleSearchURLButton : @(MPFilterUrls)
+                           } retain];
     _entryArrayController = [[NSArrayController alloc] init];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didChangeGroupSelectionInOutlineView:)
@@ -67,26 +97,33 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 }
 
 - (void)didLoadView {
-  
   [self.view setWantsLayer:YES];
   [self hideStatusBarAnimated:NO];
   [[self.searchLabelTextField cell] setBackgroundStyle:NSBackgroundStyleRaised];
+  
+  [self.searchURLButton setIdentifier:_toggleSearchURLButton];
+  [self.searchUsernameButton setIdentifier:_toggleSearchUsernameButton];
+  [self.searchTitleButton setIdentifier:_toggleSearchTitleButton];
+  
   [self.entryTable setDelegate:self];
   
   NSTableColumn *parentColumn = [self.entryTable tableColumns][0];
   NSTableColumn *titleColumn = [self.entryTable tableColumns][1];
   NSTableColumn *userNameColumn = [self.entryTable tableColumns][2];
   NSTableColumn *passwordColumn = [self.entryTable tableColumns][3];
+  NSTableColumn *urlColumn = [self.entryTable tableColumns][4];
   
   [parentColumn setIdentifier:MPEntryTableParentColumnIdentifier];
   [titleColumn setIdentifier:MPEntryTableTitleColumnIdentifier];
   [userNameColumn setIdentifier:MPEntryTableUserNameColumnIdentifier];
   [passwordColumn setIdentifier:MPEntryTablePasswordColumnIdentifier];
+  [urlColumn setIdentifier:MPEntryTableURLColumnIdentifier];
   
   [[parentColumn headerCell] setStringValue:@"Group"];
   [[titleColumn headerCell] setStringValue:@"Title"];
   [[userNameColumn headerCell] setStringValue:@"Username"];
   [[passwordColumn headerCell] setStringValue:@"Password"];
+  [[urlColumn headerCell] setStringValue:@"URL"];
   
   [self.entryTable bind:NSContentBinding toObject:self.entryArrayController withKeyPath:@"arrangedObjects" options:nil];
   
@@ -102,6 +139,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   const BOOL isGroupColumn = [[tableColumn identifier] isEqualToString:MPEntryTableParentColumnIdentifier];
   const BOOL isPasswordColum = [[tableColumn identifier] isEqualToString:MPEntryTablePasswordColumnIdentifier];
   const BOOL isUsernameColumn = [[tableColumn identifier] isEqualToString:MPEntryTableUserNameColumnIdentifier];
+  const BOOL isURLColumn = [[tableColumn identifier] isEqualToString:MPEntryTableURLColumnIdentifier];
   
   NSTableCellView *view = nil;
   if(isTitleColumn || isGroupColumn) {
@@ -113,19 +151,19 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
     else {
       [[view textField] setStringValue:entry.parent.name];
     }
-    return view;
   }
-  
-  if( isPasswordColum ) {
+  else if( isPasswordColum ) {
     view = [tableView makeViewWithIdentifier:_MPTAbleSecurCellView owner:self];
     [[view textField] setStringValue:entry.password];
-    return view;
   }
-  
-  if( isUsernameColumn ) {
+  else if( isUsernameColumn || isURLColumn ) {
     view = [tableView makeViewWithIdentifier:_MPTableStringCellView owner:self];
-    [[view textField] setStringValue:entry.username];
-    return view;
+    if(isURLColumn) {
+      [[view textField] setStringValue:entry.url];
+    }
+    else {
+      [[view textField] setStringValue:entry.username];
+    }
   }
   
   return view;
@@ -165,11 +203,22 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   if(openDatabase && [self hasFilter]) {
     [self showStatusBarAnimated:YES];
     
+    
     dispatch_queue_t backgroundQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
     dispatch_async(backgroundQueue, ^{
       
-      NSPredicate *filterPredicate = [NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", self.filter];
-      self.filteredEntries = [[openDatabase.root childEntries] filteredArrayUsingPredicate:filterPredicate];
+      NSMutableArray *prediactes = [NSMutableArray arrayWithCapacity:3];
+      if( [self shouldFilterTitles] ) {
+        [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", self.filter]];
+      }
+      if( [self shouldFilterUsernames] ) {
+        [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.username CONTAINS[cd] %@", self.filter]];
+      }
+      if( [self shouldFilterURLs] ) {
+        [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.url CONTAINS[cd] %@", self.filter]];
+      }
+      NSPredicate *fullFilter = [NSCompoundPredicate orPredicateWithSubpredicates:prediactes];
+      self.filteredEntries = [[openDatabase.root childEntries] filteredArrayUsingPredicate:fullFilter];
       
       dispatch_sync(dispatch_get_main_queue(), ^{
         [self.entryArrayController setContent:self.filteredEntries];
@@ -192,10 +241,15 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   if(self.isStatusBarVisible) {
     return; // nothign to to
   }
+  
+  [self.searchTitleButton setState:[self shouldFilterTitles] ? NSOnState : NSOffState];
+  [self.searchURLButton setState:[self shouldFilterURLs] ? NSOnState : NSOffState ];
+  [self.searchUsernameButton setState:[self shouldFilterUsernames] ? NSOnState : NSOffState];
+  
   self.isStatusBarVisible = YES;
   self.statusBarToTop.constant = 0;
   self.tableToTop.constant = [self.statusBar frame].size.height;
-    
+  
   if(animate) {
     [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
       context.duration = STATUS_BAR_ANIMATION_TIME;
@@ -230,5 +284,43 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   }
 }
 
+#pragma mark Actions
+
+- (void)toggleFilterSpace:(id)sender {
+  NSButton *button = sender;
+  NSNumber *value = self.filterButtonToMode[[button identifier]];
+  MPFilterModeType toggledMode = (MPFilterModeType)[value intValue];
+  switch ([button state]) {
+    case NSOnState:
+      self.filterMode |= toggledMode;
+      break;
+      
+    case NSOffState:
+      self.filterMode ^= toggledMode;
+      break;
+      
+    default:
+      break;
+  }
+}
+
+- (void)setFilterMode:(MPFilterModeType)newFilterMode {
+  if(_filterMode != newFilterMode) {
+    _filterMode = newFilterMode;
+    [self updateFilter];
+  }
+}
+
+- (BOOL)shouldFilterTitles {
+  return ( MPFilterNone != (self.filterMode & MPFilterTitles));
+}
+
+- (BOOL)shouldFilterURLs {
+  return ( MPFilterNone != (self.filterMode & MPFilterUrls));
+}
+
+- (BOOL)shouldFilterUsernames {
+  return ( MPFilterNone != (self.filterMode & MPFilterUsernames));
+}
 
 @end
diff --git a/MacPass/MPGeneralSettingsController.h b/MacPass/MPGeneralSettingsController.h
index e5c36213..804e7e2a 100644
--- a/MacPass/MPGeneralSettingsController.h
+++ b/MacPass/MPGeneralSettingsController.h
@@ -8,7 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 #import "MPSettingsTabProtocoll.h"
+#import "MPViewController.h"
 
-@interface MPGeneralSettingsController : NSViewController <MPSettingsTabProtocoll>
+@interface MPGeneralSettingsController : MPViewController <MPSettingsTabProtocoll>
+@property (assign) IBOutlet NSProgressIndicator *spinner;
 
 @end
diff --git a/MacPass/MPGeneralSettingsController.m b/MacPass/MPGeneralSettingsController.m
index b0a1c9d1..bab707cc 100644
--- a/MacPass/MPGeneralSettingsController.m
+++ b/MacPass/MPGeneralSettingsController.m
@@ -35,11 +35,6 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
     return self;
 }
 
-- (void)loadView {
-  [super loadView];
-  [self didLoadView];
-}
-
 - (void)didLoadView {
   // setup connections
   NSMenu *encodingMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
@@ -57,6 +52,8 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
 
   [_encodingPopup setMenu:encodingMenu];
   [encodingMenu release];
+
+  
 }
 
 @end
diff --git a/MacPass/MPMainWindowController.m b/MacPass/MPMainWindowController.m
index 03a200ec..2cb3733b 100644
--- a/MacPass/MPMainWindowController.m
+++ b/MacPass/MPMainWindowController.m
@@ -114,6 +114,7 @@
   else {
     [self.contentView addSubview:newContentView];
   }
+  [self.contentView setNeedsDisplay:YES];
   [self.splitView adjustSubviews];
   /*
    Set focus AFTER having added the view
@@ -132,7 +133,6 @@
   NSView *outlineView = [self.splitView subviews][0];
   if([outlineView isHidden]) {
     [self.splitView setPosition:MPMainWindowSplitViewDelegateMinimumOutlineWidth ofDividerAtIndex:0];
-
   }
 }
 
@@ -172,6 +172,10 @@
   self.entryViewController.filter = [searchField stringValue];
 }
 
+- (void)cancelFilter:(id)sender {
+  NSLog(@"Whooo");
+}
+
 #pragma mark Notifications
 
 - (void)didOpenDocument:(NSNotification *)notification {
diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index 30593a50..d9db2430 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -54,7 +54,7 @@ NSString *const MPToolbarItemSearch = @"Search";
       NSSearchField *searchfield = [[NSSearchField alloc] initWithFrame:NSMakeRect(0, 0, 70, 32)];
       [item setView:searchfield];
       [searchfield setAction:@selector(updateFilter:)];
-      [[searchfield cell] setSendsSearchStringImmediately:YES];
+      [[searchfield cell] setSendsSearchStringImmediately:NO];
       [searchfield release];
       self.searchItem = item;
     }
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 640ad819..a31aaf9d 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1C8</string>
+	<string>201</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/MainWindow.xib b/MacPass/MainWindow.xib
index 9406f6a3..df42a85d 100644
--- a/MacPass/MainWindow.xib
+++ b/MacPass/MainWindow.xib
@@ -70,7 +70,16 @@
 									<string key="NSFrame">{{257, 0}, {470, 630}}</string>
 									<reference key="NSSuperview" ref="947682332"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView"/>
+									<bool key="NSViewIsLayerTreeHost">YES</bool>
+									<object class="NSDictionary" key="NSViewAnimations">
+										<string key="NS.key.0">subviews</string>
+										<object class="CATransition" key="NS.object.0">
+											<string key="type">fade</string>
+											<array key="__CACodingContents">
+												<string>type</string>
+											</array>
+										</object>
+									</object>
 									<string key="NSReuseIdentifierKey">_NS:13</string>
 									<string key="NSClassName">NSView</string>
 								</object>
@@ -89,7 +98,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="947682332"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{400, 422}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -223,6 +232,7 @@
 						<string key="contentView">NSView</string>
 						<string key="outlineView">NSView</string>
 						<string key="splitView">NSSplitView</string>
+						<string key="welcomeText">NSTextField</string>
 						<string key="welcomeView">NSView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -238,6 +248,10 @@
 							<string key="name">splitView</string>
 							<string key="candidateClassName">NSSplitView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="welcomeText">
+							<string key="name">welcomeText</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="welcomeView">
 							<string key="name">welcomeView</string>
 							<string key="candidateClassName">NSView</string>