diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index b39d14a0..607d6ed0 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -61,7 +61,7 @@
 										<string key="NSFrameSize">{788, 511}</string>
 										<reference key="NSSuperview" ref="262664416"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="788738248"/>
+										<reference key="NSNextKeyView" ref="736877784"/>
 										<string key="NSReuseIdentifierKey">_NS:13</string>
 										<bool key="NSEnabled">YES</bool>
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -345,7 +345,7 @@
 						<string key="NSFrameSize">{788, 528}</string>
 						<reference key="NSSuperview" ref="997686550"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="736877784"/>
+						<reference key="NSNextKeyView" ref="262664416"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="NSsFlags">133680</int>
 						<reference key="NSVScroller" ref="1037276411"/>
@@ -384,14 +384,6 @@
 					</object>
 					<int key="connectionID">395</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">entryTableScrollView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="613995671"/>
-					</object>
-					<int key="connectionID">562</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">tableToTop</string>
@@ -413,30 +405,7 @@
 							<int key="contentType">3</int>
 						</object>
 					</object>
-					<int key="connectionID">671</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableToBottom</string>
-						<reference key="source" ref="1001"/>
-						<object class="IBNSLayoutConstraint" key="destination" id="986749424">
-							<reference key="firstItem" ref="613995671"/>
-							<int key="firstAttribute">4</int>
-							<int key="relation">0</int>
-							<reference key="secondItem" ref="997686550"/>
-							<int key="secondAttribute">4</int>
-							<float key="multiplier">1</float>
-							<object class="IBLayoutConstant" key="constant">
-								<double key="value">0.0</double>
-							</object>
-							<float key="priority">1000</float>
-							<reference key="containingView" ref="997686550"/>
-							<int key="scoringType">9</int>
-							<float key="scoringTypeFloat">40</float>
-							<int key="contentType">3</int>
-						</object>
-					</object>
-					<int key="connectionID">672</int>
+					<int key="connectionID">686</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -688,8 +657,23 @@
 						<int key="objectID">336</int>
 						<reference key="object" ref="997686550"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="21269565">
+								<reference key="firstItem" ref="613995671"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="997686550"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="997686550"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<reference ref="858505477"/>
-							<reference ref="986749424"/>
 							<object class="IBNSLayoutConstraint" id="945226060">
 								<reference key="firstItem" ref="613995671"/>
 								<int key="firstAttribute">6</int>
@@ -1337,16 +1321,6 @@
 						<reference key="object" ref="55280177"/>
 						<reference key="parent" ref="954630866"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">666</int>
-						<reference key="object" ref="986749424"/>
-						<reference key="parent" ref="997686550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">670</int>
-						<reference key="object" ref="858505477"/>
-						<reference key="parent" ref="997686550"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">676</int>
 						<reference key="object" ref="253618752"/>
@@ -1372,6 +1346,16 @@
 						<reference key="object" ref="843799871"/>
 						<reference key="parent" ref="954630866"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">683</int>
+						<reference key="object" ref="858505477"/>
+						<reference key="parent" ref="997686550"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">685</int>
+						<reference key="object" ref="21269565"/>
+						<reference key="parent" ref="997686550"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1432,11 +1416,11 @@
 				<string key="313.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="314.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="330.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="336.IBNSViewMetadataConstraints">
+				<array key="336.IBNSViewMetadataConstraints">
 					<reference ref="647884172"/>
 					<reference ref="945226060"/>
-					<reference ref="986749424"/>
 					<reference ref="858505477"/>
+					<reference ref="21269565"/>
 				</array>
 				<boolean value="NO" key="336.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
 				<boolean value="NO" key="336.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1500,18 +1484,18 @@
 				<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>
-				<string key="666.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="670.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="676.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="677.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="678.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="679.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="683.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="685.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">681</int>
+			<int key="maxID">686</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/MacPass/FilterBar.xib b/MacPass/FilterBar.xib
index 5a16ca59..b1e7b3b9 100644
--- a/MacPass/FilterBar.xib
+++ b/MacPass/FilterBar.xib
@@ -45,9 +45,10 @@
 					<object class="NSSearchField" id="498286707">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{369, 5}, {136, 19}}</string>
+						<string key="NSFrame">{{242, 6}, {100, 19}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="113591000"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSearchFieldCell" key="NSCell" id="456364439">
@@ -120,7 +121,7 @@
 					<object class="NSButton" id="113591000">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{513, 5}, {42, 17}}</string>
+						<string key="NSFrame">{{350, 6}, {42, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -144,10 +145,10 @@
 					<object class="NSButton" id="340435610">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{188, 5}, {38, 17}}</string>
+						<string key="NSFrame">{{188, 6}, {38, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="113591000"/>
+						<reference key="NSNextKeyView" ref="498286707"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="149174717">
@@ -173,7 +174,7 @@
 					<object class="NSButton" id="902262560">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{104, 5}, {76, 17}}</string>
+						<string key="NSFrame">{{104, 6}, {76, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="340435610"/>
@@ -198,7 +199,7 @@
 					<object class="NSTextField" id="906526407">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{5, 6}, {44, 14}}</string>
+						<string key="NSFrame">{{5, 7}, {44, 14}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="7073340"/>
@@ -239,7 +240,7 @@
 					<object class="NSButton" id="7073340">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{54, 4}, {42, 19}}</string>
+						<string key="NSFrame">{{54, 5}, {42, 19}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="902262560"/>
@@ -262,7 +263,7 @@
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{563, 28}</string>
+				<string key="NSFrameSize">{400, 30}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="906526407"/>
@@ -351,6 +352,14 @@
 					</object>
 					<int key="connectionID">79</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">filterSearchField</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="498286707"/>
+					</object>
+					<int key="connectionID">95</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -736,11 +745,6 @@
 						<reference key="object" ref="791616402"/>
 						<reference key="parent" ref="113591000"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">63</int>
-						<reference key="object" ref="207946731"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">66</int>
 						<reference key="object" ref="274700398"/>
@@ -761,7 +765,7 @@
 						<reference key="object" ref="498286707"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="456364439"/>
-							<object class="IBNSLayoutConstraint" id="880645438">
+							<object class="IBNSLayoutConstraint" id="817657248">
 								<reference key="firstItem" ref="498286707"/>
 								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
@@ -769,12 +773,12 @@
 								<int key="secondAttribute">0</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">136</double>
+									<double key="value">100</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="498286707"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
 							</object>
 						</array>
@@ -785,16 +789,6 @@
 						<reference key="object" ref="456364439"/>
 						<reference key="parent" ref="498286707"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">83</int>
-						<reference key="object" ref="548170831"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">85</int>
-						<reference key="object" ref="880645438"/>
-						<reference key="parent" ref="498286707"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">86</int>
 						<reference key="object" ref="120785100"/>
@@ -805,13 +799,28 @@
 						<reference key="object" ref="312382951"/>
 						<reference key="parent" ref="1005"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="548170831"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">63</int>
+						<reference key="object" ref="207946731"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">93</int>
+						<reference key="object" ref="817657248"/>
+						<reference key="parent" ref="498286707"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="1.IBNSViewMetadataConstraints">
+				<array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
 					<reference ref="777287174"/>
 					<reference ref="201173489"/>
 					<reference ref="274700398"/>
@@ -858,22 +867,22 @@
 				<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="80.IBNSViewMetadataConstraints">
-					<reference ref="880645438"/>
+				<array key="80.IBNSViewMetadataConstraints">
+					<reference ref="817657248"/>
 				</array>
 				<boolean value="NO" key="80.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="93.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">87</int>
+			<int key="maxID">95</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -908,7 +917,6 @@
 						<string key="filterTitleButton">NSButton</string>
 						<string key="filterURLButton">NSButton</string>
 						<string key="filterUsernameButton">NSButton</string>
-						<string key="tableToBottom">NSLayoutConstraint</string>
 						<string key="tableToTop">NSLayoutConstraint</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -944,10 +952,6 @@
 							<string key="name">filterUsernameButton</string>
 							<string key="candidateClassName">NSButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="tableToBottom">
-							<string key="name">tableToBottom</string>
-							<string key="candidateClassName">NSLayoutConstraint</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="tableToTop">
 							<string key="name">tableToTop</string>
 							<string key="candidateClassName">NSLayoutConstraint</string>
diff --git a/MacPass/MPDocumentWindowController.h b/MacPass/MPDocumentWindowController.h
index 40e67825..f8e44d1c 100644
--- a/MacPass/MPDocumentWindowController.h
+++ b/MacPass/MPDocumentWindowController.h
@@ -26,6 +26,7 @@
 @property (readonly, retain) MPInspectorViewController *inspectorTabViewController;
 @property (readonly, retain) MPCreationViewController *creationViewController;
 
+
 - (void)showEntries;
 - (void)showPasswordInput;
 - (void)performFindPanelAction:(id)sender;
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 53a23d0c..28a15afa 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -184,7 +184,7 @@
   NSView *entryView = [_entryViewController view];
   
   NSDictionary *views = NSDictionaryOfVariableBindings(outlineView, inspectorView, entryView, _splitView);
-  [self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[outlineView(>=150,<=250)]-1-[entryView(>=250)]-1-[inspectorView(>=200)]|"
+  [self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[outlineView(>=150,<=250)]-1-[entryView(>=300)]-1-[inspectorView(>=200)]|"
                                                                          options:0
                                                                          metrics:nil
                                                                            views:views]];
diff --git a/MacPass/MPEntryViewController.h b/MacPass/MPEntryViewController.h
index 15650fe3..00f0dde1 100644
--- a/MacPass/MPEntryViewController.h
+++ b/MacPass/MPEntryViewController.h
@@ -28,11 +28,7 @@ typedef enum {
 @class KdbEntry;
 @class MPOutlineViewDelegate;
 
-@interface MPEntryViewController : MPViewController <NSTableViewDelegate> {
-@private
-  BOOL _isFilterBarVisible;
-}
-
+@interface MPEntryViewController : MPViewController <NSTableViewDelegate>
 
 @property (assign) KdbGroup *activeGroup;
 @property (readonly, assign, nonatomic) KdbEntry *selectedEntry;
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 8cd025dd..6cfa7c0e 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -56,8 +56,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 @property (retain) NSArray *filteredEntries;
 @property (retain) IBOutlet NSView *filterBar;
 @property (assign) IBOutlet NSTableView *entryTable;
-@property (assign) IBOutlet NSLayoutConstraint *tableToTop;
-@property (assign) IBOutlet NSLayoutConstraint *tableToBottom;
+@property (retain) IBOutlet NSLayoutConstraint *tableToTop;
 @property (assign) IBOutlet NSButton *filterDoneButton;
 
 @property (assign) IBOutlet NSButton *filterTitleButton;
@@ -79,7 +78,9 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 - (BOOL)_shouldFilterUsernames;
 
 - (BOOL)hasFilter;
+- (BOOL)_showsFilterBar;
 - (void)updateFilter;
+- (void)updateFilterText:(id)sender;
 - (void)setupFilterBar;
 - (void)_setupEntryMenu;
 /* Notification handling */
@@ -103,7 +104,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
   if(self) {
-    _isFilterBarVisible = NO;
     _filterMode = MPFilterTitles;
     _filterButtonToMode = [@{ _toggleFilterUsernameButton : @(MPFilterUsernames),
                            _toggleFilterTitleButton : @(MPFilterTitles),
@@ -229,8 +229,9 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
 #pragma mark Notifications
 - (void)_didChangeGroupSelectionInOutlineView:(NSNotification *)notification {
-  if([self hasFilter]) {
-    [self.filterSearchField setStringValue:@""];
+  if([self _showsFilterBar]) {
+    //[self.filterSearchField setStringValue:@""];
+    [self clearFilter:nil];
   }
   MPOutlineViewDelegate *delegate = [notification object];
   self.activeGroup = delegate.selectedGroup;
@@ -274,6 +275,9 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
 - (void)updateFilter {
   [self _showFilterBarAnimated:YES];
+  if(![self hasFilter]) {
+    return;
+  }
   
   dispatch_queue_t backgroundQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
   dispatch_async(backgroundQueue, ^{
@@ -293,6 +297,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
     self.filteredEntries = [[document.root childEntries] filteredArrayUsingPredicate:fullFilter];
     
     dispatch_sync(dispatch_get_main_queue(), ^{
+      [self.entryArrayController unbind:NSContentArrayBinding];
       [self.entryArrayController setContent:self.filteredEntries];
       [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:NO];
     });
@@ -300,6 +305,10 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   
 }
 
+- (void)updateFilterText:(id)sender {
+  self.filter = [self.filterSearchField stringValue];
+}
+
 - (void)setupFilterBar {
   if(!self.filterBar) {
     [[NSBundle mainBundle] loadNibNamed:@"FilterBar" owner:self topLevelObjects:nil];
@@ -310,12 +319,15 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
     [self.filterDoneButton setAction:@selector(clearFilter:)];
     [self.filterDoneButton setTarget:nil];
     
-    [self.filterSearchField setAction:@selector(updateFilter:)];
+    [self.filterSearchField setAction:@selector(updateFilterText:)];
     [[self.filterSearchField cell] setSendsSearchStringImmediately:NO];
-    
   }
 }
 
+- (BOOL)_showsFilterBar {
+  return ( nil != [self.filterBar superview]);
+}
+
 #pragma mark UI Feedback
 
 - (void)_showFilterBarAnimated:(BOOL)animate {
@@ -332,19 +344,20 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   [self.filterURLButton setState:[self _shouldFilterURLs] ? NSOnState : NSOffState ];
   [self.filterUsernameButton setState:[self _shouldFilterUsernames] ? NSOnState : NSOffState];
   
-  if(_isFilterBarVisible) {
-    return; // nothign to to
+  if([self _showsFilterBar]) {
+    return; // nothing to to
   }
   
-  [((MPDocumentWindowController *)[[self.view window] windowController]) clearOutlineSelection:nil];
-  _isFilterBarVisible = YES;
-  self.tableToTop.constant = [self.filterBar frame].size.height;
+  [[[self.view window] windowController] clearOutlineSelection:nil];
   
+  NSView *scrollView = [_entryTable enclosingScrollView];
+  NSDictionary *views = NSDictionaryOfVariableBindings(scrollView, _filterBar);
+  [self.view layout];
+  [self.view removeConstraint:self.tableToTop];
   [self.view addSubview:self.filterBar];
-  NSRect filterFrame = [self.filterBar frame];
-  filterFrame.origin.y = [self.view frame].size.height - filterFrame.size.height;
-  filterFrame.size.width = [self.view frame].size.width;
-  [self.filterBar setFrame:filterFrame];
+  [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_filterBar]|" options:0 metrics:nil views:views]];
+  [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_filterBar(==30)]-0-[scrollView]" options:0 metrics:nil views:views]];
+
   
   if(animate) {
     [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
@@ -362,13 +375,12 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   
   animate = NO;
   
-  if(!_isFilterBarVisible) {
+  if(![self _showsFilterBar]) {
     return; // nothing to do;
   }
   
-  _isFilterBarVisible = NO;
-  self.tableToTop.constant = -1;
   [self.filterBar removeFromSuperview];
+  [self.view addConstraint:self.tableToTop];
   
   if(animate) {
     [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 27fd8355..8eb022e2 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>A6E</string>
+	<string>AAD</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/en.lproj/MainMenu.xib b/MacPass/en.lproj/MainMenu.xib
index 4521b152..c8c5617f 100644
--- a/MacPass/en.lproj/MainMenu.xib
+++ b/MacPass/en.lproj/MainMenu.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
+		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -380,49 +380,15 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="892235320">
+								<object class="NSMenuItem" id="447796847">
 									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Find</string>
-									<string key="NSKeyEquiv"/>
+									<string key="NSTitle">Find…</string>
+									<string key="NSKeyEquiv">f</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="963351320">
-										<string key="NSTitle">Find</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="447796847">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Find…</string>
-												<string key="NSKeyEquiv">f</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="159080638">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Use Selection for Find</string>
-												<string key="NSKeyEquiv">e</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">7</int>
-											</object>
-											<object class="NSMenuItem" id="88285865">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Jump to Selection</string>
-												<string key="NSKeyEquiv">j</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-									</object>
+									<int key="NSTag">1</int>
 								</object>
 							</array>
 						</object>
@@ -708,22 +674,6 @@
 					</object>
 					<int key="connectionID">240</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="447796847"/>
-					</object>
-					<int key="connectionID">241</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">centerSelectionInVisibleArea:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="88285865"/>
-					</object>
-					<int key="connectionID">245</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">saveDocument:</string>
@@ -796,14 +746,6 @@
 					</object>
 					<int key="connectionID">374</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="159080638"/>
-					</object>
-					<int key="connectionID">489</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showHelp:</string>
@@ -828,6 +770,14 @@
 					</object>
 					<int key="connectionID">1206</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="447796847"/>
+					</object>
+					<int key="connectionID">241</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showPreferences:</string>
@@ -1001,7 +951,7 @@
 							<reference ref="860595796"/>
 							<reference ref="1040322652"/>
 							<reference ref="790794224"/>
-							<reference ref="892235320"/>
+							<reference ref="447796847"/>
 						</array>
 						<reference key="parent" ref="952259628"/>
 					</object>
@@ -1050,39 +1000,6 @@
 						<reference key="object" ref="790794224"/>
 						<reference key="parent" ref="789758025"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">218</int>
-						<reference key="object" ref="892235320"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="963351320"/>
-						</array>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">220</int>
-						<reference key="object" ref="963351320"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="88285865"/>
-							<reference ref="159080638"/>
-							<reference ref="447796847"/>
-						</array>
-						<reference key="parent" ref="892235320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">210</int>
-						<reference key="object" ref="88285865"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">221</int>
-						<reference key="object" ref="159080638"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">209</int>
-						<reference key="object" ref="447796847"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">57</int>
 						<reference key="object" ref="110575045"/>
@@ -1282,6 +1199,11 @@
 						<reference key="object" ref="915918141"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">209</int>
+						<reference key="object" ref="447796847"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1318,13 +1240,9 @@
 				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1383,15 +1301,10 @@
 					<string key="className">MPAppDelegate</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="showMainWindow:">id</string>
 						<string key="showPasswordCreator:">id</string>
 						<string key="showPreferences:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="showMainWindow:">
-							<string key="name">showMainWindow:</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBActionInfo" key="showPasswordCreator:">
 							<string key="name">showPasswordCreator:</string>
 							<string key="candidateClassName">id</string>
@@ -1431,40 +1344,17 @@
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contentView">NSView</string>
-						<string key="inspectorView">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">
-						<object class="IBToOneOutletInfo" key="contentView">
-							<string key="name">contentView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="inspectorView">
-							<string key="name">inspectorView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="outlineView">
-							<string key="name">outlineView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="splitView">
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">splitView</string>
+						<string key="NS.object.0">NSSplitView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">splitView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
 							<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>
-						</object>
-					</dictionary>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/MPDocumentWindowController.h</string>