diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5426319f9..94d9e7c53 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -122,7 +122,7 @@ typedef enum
 #define WINDOW_REGULAR_WIDTH    468.0
 
 #define SEARCH_FILTER_MIN_WIDTH 55.0
-#define SEARCH_FILTER_MAX_WIDTH 115.0
+#define SEARCH_FILTER_MAX_WIDTH 110.0
 
 #define UPDATE_UI_SECONDS           1.0
 #define AUTO_SPEED_LIMIT_SECONDS    5.0
@@ -584,9 +584,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
     //save history
     [self updateTorrentHistory];
     
-    [fDisplayedTorrents removeAllObjects];
-    [fTorrents removeAllObjects];
-    
     //remaining calls the same as dealloc 
     [fInfoController release];
     [fMessageController release];
@@ -3612,9 +3609,8 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         //make sure it is not too long
         if (frame.size.width > SEARCH_FILTER_MAX_WIDTH)
         {
-            float different = frame.size.width - SEARCH_FILTER_MAX_WIDTH;
-            frame.origin.x += different;
-            frame.size.width -= different;
+            frame.origin.x += frame.size.width - SEARCH_FILTER_MAX_WIDTH;
+            frame.size.width = SEARCH_FILTER_MAX_WIDTH;
         }
         [fSearchFilterField setFrame: frame];
     }
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index d73e32b8c..a2252f92f 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -264,14 +264,6 @@
 			<key>SUPERCLASS</key>
 			<string>NSObject</string>
 		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>FilterButton</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSButton</string>
-		</dict>
 		<dict>
 			<key>ACTIONS</key>
 			<dict>
@@ -310,6 +302,14 @@
 			<key>SUPERCLASS</key>
 			<string>NSTableView</string>
 		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>FilterButton</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSButton</string>
+		</dict>
 		<dict>
 			<key>CLASS</key>
 			<string>ActionPopUpButton</string>
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 42a45cbbd..5c56f60d2 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,9 @@
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
-	<array/>
+	<array>
+		<integer>1603</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>9B18</string>
 	<key>targetFramework</key>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 6063b66a8..adc92df5b 100644
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ