diff --git a/Changelog.rtf b/Changelog.rtf
index e4046c8..1f48098 100644
--- a/Changelog.rtf
+++ b/Changelog.rtf
@@ -63,4 +63,5 @@
 -Fixed a bug: "Network error" when having special characters in query\
 -Fixed a bug: Returned false results when having a "&" in the query\
 -Fixed a resource bug\
--Fixed special characters in url bug (final)}
\ No newline at end of file
+-Fixed special characters in url bug (final)\
+}
\ No newline at end of file
diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings
index 1bb1a96..560c767 100644
--- a/de.lproj/Localizable.strings
+++ b/de.lproj/Localizable.strings
@@ -75,4 +75,4 @@
 
 "Growl.messages.lyricsSent.title" = "Songtext an iTunes gesendet";
 
-"Growl.messages.lyricsSent.detail" = "Songtext an \"%@\" gesendet.";
\ No newline at end of file
+"Growl.messages.lyricsSent.detail" = "Songtext an \"%@\" gesendet.";
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
index e2fcd73..a34b8bb 100644
--- a/en.lproj/Localizable.strings
+++ b/en.lproj/Localizable.strings
@@ -76,4 +76,4 @@
 "Growl.messages.lyricsSent.title" = "Lyrics sent to iTunes";
 
 /* %@ is the name of the song */
-"Growl.messages.lyricsSent.detail" = "Lyrics sent to \"%@\".";
\ No newline at end of file
+"Growl.messages.lyricsSent.detail" = "Lyrics sent to \"%@\".";
diff --git a/iLyrics/AppDelegate.h b/iLyrics/AppDelegate.h
index d88cb2f..64982dd 100644
--- a/iLyrics/AppDelegate.h
+++ b/iLyrics/AppDelegate.h
@@ -27,5 +27,4 @@
 - (IBAction)playPauseiTunes:(id)sender;
 - (IBAction)previousTrack:(id)sender;
 - (IBAction)nextTrack:(id)sender;
-
 @end
diff --git a/iLyrics/AppDelegate.m b/iLyrics/AppDelegate.m
index d72d6dd..cff1582 100644
--- a/iLyrics/AppDelegate.m
+++ b/iLyrics/AppDelegate.m
@@ -106,4 +106,5 @@
 - (IBAction)nextTrack:(id)sender {
     [iTunes nextTrack];
 }
+
 @end
diff --git a/iLyrics/AutoLyrics.h b/iLyrics/AutoLyrics.h
index 5fae972..2f5c5a9 100644
--- a/iLyrics/AutoLyrics.h
+++ b/iLyrics/AutoLyrics.h
@@ -24,5 +24,4 @@
 
 -(void) saveToDefaults: (NSUserDefaults *)defaults;
 -(void) loadFromDefaults: (NSUserDefaults *)defaults;
-
 @end
diff --git a/iLyrics/AutoLyrics.m b/iLyrics/AutoLyrics.m
index 7563afc..c17ce66 100644
--- a/iLyrics/AutoLyrics.m
+++ b/iLyrics/AutoLyrics.m
@@ -90,5 +90,4 @@ AutoLyrics *instace;
     enabled = [defaults boolForKey:@"Auto Lyrics Enabled"];
     replaceOldLyrics = [defaults boolForKey:@"Auto Lyrics replaces old lyrics"];
 }
-
 @end
diff --git a/iLyrics/Lyrics.h b/iLyrics/Lyrics.h
index eb6f370..cfc26ca 100644
--- a/iLyrics/Lyrics.h
+++ b/iLyrics/Lyrics.h
@@ -9,9 +9,11 @@
 #import <Foundation/Foundation.h>
 
 @interface Lyrics : NSObject
+
 @property NSString *name;
 @property NSString *artist;
 @property NSString *lyrics;
+
 -(id)initWithName: (NSString*) name byArtist: (NSString*) artist withLyrics: (NSString*) lyrics;
 
 @end
diff --git a/iLyrics/Lyrics.m b/iLyrics/Lyrics.m
index 0435c89..9deb9a4 100644
--- a/iLyrics/Lyrics.m
+++ b/iLyrics/Lyrics.m
@@ -20,5 +20,4 @@
     name = son;
     return self;
 }
-
 @end
diff --git a/iLyrics/Magistrix.h b/iLyrics/Magistrix.h
index 3e87735..9cd441b 100644
--- a/iLyrics/Magistrix.h
+++ b/iLyrics/Magistrix.h
@@ -10,5 +10,4 @@
 #import "LyricsHoster.h"
 
 @interface Magistrix : NSObject <LyricsHoster>
-
 @end
diff --git a/iLyrics/Magistrix.m b/iLyrics/Magistrix.m
index 547da6e..2b91c8b 100644
--- a/iLyrics/Magistrix.m
+++ b/iLyrics/Magistrix.m
@@ -216,4 +216,5 @@ typedef enum {
     NSString *lyrics = [self stringByRemovingHTMLTags:[page substringWithRange:NSMakeRange(lyricsStart, lyricsEnd-lyricsStart)]];
     return lyrics;
 }
+
 @end
diff --git a/iLyrics/MainController.h b/iLyrics/MainController.h
index a83f6e2..35a4a3d 100644
--- a/iLyrics/MainController.h
+++ b/iLyrics/MainController.h
@@ -45,5 +45,4 @@
 - (IBAction)showiLyricsWindow:(id)sender;
 - (void)saveToDefalts: (NSUserDefaults *)defaults;
 - (void)loadFromDefaults: (NSUserDefaults *)defaults;
-
 @end
diff --git a/iLyrics/MainController.m b/iLyrics/MainController.m
index 597ee55..6049ae1 100644
--- a/iLyrics/MainController.m
+++ b/iLyrics/MainController.m
@@ -46,27 +46,15 @@
 #pragma mark Outline view Data Source and Delegate
 
 -(NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
-    if (item == nil) {
-        return [loadedResults count];
-    }
-    if ([item isKindOfClass:[NSArray class]]) {
-        return [item count];
-    }
-    return 0;
+    return item == nil ? [loadedResults count] : 0;
 }
 
 -(id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item {
-    if (item == nil) {
-        return [loadedResults objectAtIndex:index];
-    }
-    if ([item isKindOfClass:[SearchResult class]]) {
-        return [item objectAtIndex:index];
-    }
-    return nil;
+    return [loadedResults objectAtIndex:index];
 }
 
 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
-    return [loadedResults containsObject:item];
+    return NO;
 }
 
 -(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
@@ -345,4 +333,5 @@
 -(void)loadFromDefaults:(NSUserDefaults *)defaults {
     [showPreviewCheckBox setState:[defaults boolForKey:@"Show preview"]?NSOnState:NSOffState];
 }
+
 @end
diff --git a/iLyrics/PreferencesController.h b/iLyrics/PreferencesController.h
index 7e149d7..3fafd5c 100644
--- a/iLyrics/PreferencesController.h
+++ b/iLyrics/PreferencesController.h
@@ -31,5 +31,4 @@
 - (IBAction)toggleAutoLyrics:(id)sender;
 - (IBAction)changeAutoLyricsInterval:(id)sender;
 - (IBAction)toggleReplaceOldLyrics:(id)sender;
-
 @end
diff --git a/iLyrics/PreferencesController.m b/iLyrics/PreferencesController.m
index f2e3801..497a79c 100644
--- a/iLyrics/PreferencesController.m
+++ b/iLyrics/PreferencesController.m
@@ -126,5 +126,4 @@
         return [dateFormatter stringFromDate:version];
     }
 }
-
 @end
diff --git a/iLyrics/PreferencesWindow.h b/iLyrics/PreferencesWindow.h
index c08909b..418938d 100644
--- a/iLyrics/PreferencesWindow.h
+++ b/iLyrics/PreferencesWindow.h
@@ -9,5 +9,4 @@
 #import <Cocoa/Cocoa.h>
 
 @interface PreferencesWindow : NSWindow
-
 @end
diff --git a/iLyrics/PreferencesWindow.m b/iLyrics/PreferencesWindow.m
index cd9aa7b..4c5d7b8 100644
--- a/iLyrics/PreferencesWindow.m
+++ b/iLyrics/PreferencesWindow.m
@@ -16,5 +16,4 @@
     }
     return [super validateUserInterfaceItem:anItem];
 }
-
 @end
diff --git a/iLyrics/SearchResult.h b/iLyrics/SearchResult.h
index 266b85c..a5e15fa 100644
--- a/iLyrics/SearchResult.h
+++ b/iLyrics/SearchResult.h
@@ -16,4 +16,5 @@
 
 -(id)initWithName: (NSString*) name fromArtist: (NSString*) artist preview: (NSString*) preview link: (id) link;
 
+
 @end
diff --git a/iLyrics/SearchResult.m b/iLyrics/SearchResult.m
index f6eb15b..3e12acd 100644
--- a/iLyrics/SearchResult.m
+++ b/iLyrics/SearchResult.m
@@ -21,5 +21,4 @@
     link = l;
     return self;
 }
-
 @end
diff --git a/iLyrics/de.lproj/MainMenu.xib b/iLyrics/de.lproj/MainMenu.xib
index 75f8a52..b79d980 100644
--- a/iLyrics/de.lproj/MainMenu.xib
+++ b/iLyrics/de.lproj/MainMenu.xib
@@ -1180,7 +1180,6 @@
 											<int key="NSvFlags">293</int>
 											<string key="NSFrame">{{141, 1}, {72, 18}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="24773797"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -1215,7 +1214,6 @@
 											<int key="NSvFlags">289</int>
 											<string key="NSFrame">{{214, -1}, {140, 23}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="547184945"/>
 											<string key="NSReuseIdentifierKey">_NS:22</string>
 											<bool key="NSEnabled">YES</bool>
@@ -1239,7 +1237,6 @@
 											<int key="NSvFlags">292</int>
 											<string key="NSFrame">{{0, -1}, {139, 23}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1053530024"/>
 											<string key="NSReuseIdentifierKey">_NS:22</string>
 											<bool key="NSEnabled">YES</bool>
@@ -1271,7 +1268,6 @@
 															<int key="NSvFlags">4352</int>
 															<string key="NSFrameSize">{352, 415}</string>
 															<reference key="NSSuperview" ref="724400969"/>
-															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="215702022"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<bool key="NSEnabled">YES</bool>
@@ -1280,7 +1276,6 @@
 																<int key="NSvFlags">256</int>
 																<string key="NSFrameSize">{352, 17}</string>
 																<reference key="NSSuperview" ref="215702022"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="724400969"/>
 																<string key="NSReuseIdentifierKey">_NS:16</string>
 																<reference key="NSTableView" ref="911257153"/>
@@ -1390,7 +1385,6 @@
 													</array>
 													<string key="NSFrame">{{1, 17}, {352, 415}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="911257153"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
 													<reference key="NSDocView" ref="911257153"/>
@@ -1407,7 +1401,6 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="222180734"/>
 													<string key="NSReuseIdentifierKey">_NS:58</string>
 													<reference key="NSTarget" ref="624056482"/>
@@ -1420,7 +1413,6 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 417}, {350, 15}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="288205323"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<int key="NSsFlags">1</int>
@@ -1436,7 +1428,6 @@
 													</array>
 													<string key="NSFrame">{{1, 0}, {352, 17}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="831140326"/>
 													<string key="NSReuseIdentifierKey">_NS:15</string>
 													<reference key="NSDocView" ref="831140326"/>
@@ -1446,7 +1437,6 @@
 											</array>
 											<string key="NSFrame">{{0, 29}, {354, 433}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="724400969"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133682</int>
@@ -1459,7 +1449,6 @@
 									</array>
 									<string key="NSFrameSize">{354, 462}</string>
 									<reference key="NSSuperview" ref="900503006"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="624056482"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 									<string key="NSClassName">NSView</string>
@@ -1481,7 +1470,6 @@
 															<int key="NSvFlags">2322</int>
 															<string key="NSFrameSize">{495, 14}</string>
 															<reference key="NSSuperview" ref="310131185"/>
-															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="136843034"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="503254842">
@@ -1545,7 +1533,6 @@
 													</array>
 													<string key="NSFrame">{{1, 1}, {495, 367}}</string>
 													<reference key="NSSuperview" ref="681186150"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="205351759"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
 													<reference key="NSDocView" ref="205351759"/>
@@ -1559,7 +1546,9 @@
 																	<integer value="5"/>
 																	<object class="NSURL">
 																		<nil key="NS.base"/>
-																		<string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string>
+																		<object class="NSMutableString" key="NS.relative">
+																			<characters key="NS.bytes">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</characters>
+																		</object>
 																	</object>
 																</array>
 															</array>
@@ -1576,7 +1565,6 @@
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{481, 1}, {15, 361}}</string>
 													<reference key="NSSuperview" ref="681186150"/>
-													<reference key="NSWindow"/>
 													<string key="NSReuseIdentifierKey">_NS:84</string>
 													<reference key="NSTarget" ref="681186150"/>
 													<string key="NSAction">_doScroller:</string>
@@ -1588,7 +1576,6 @@
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{1, 353}, {489, 15}}</string>
 													<reference key="NSSuperview" ref="681186150"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="210278845"/>
 													<string key="NSReuseIdentifierKey">_NS:33</string>
 													<int key="NSsFlags">1</int>
@@ -1600,7 +1587,6 @@
 											</array>
 											<string key="NSFrameSize">{497, 369}</string>
 											<reference key="NSSuperview" ref="547184945"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="310131185"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133170</int>
@@ -1617,7 +1603,6 @@
 													<int key="NSvFlags">265</int>
 													<string key="NSFrame">{{330, 10}, {153, 32}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="681186150"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1641,7 +1626,6 @@
 													<int key="NSvFlags">265</int>
 													<string key="NSFrame">{{330, 37}, {153, 32}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="875899735"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1665,7 +1649,6 @@
 													<int key="NSvFlags">266</int>
 													<string key="NSFrame">{{82, 20}, {249, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="988585596"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -1686,7 +1669,6 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{17, 20}, {63, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="584106199"/>
 													<string key="NSReuseIdentifierKey">_NS:1505</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1706,7 +1688,6 @@
 													<int key="NSvFlags">266</int>
 													<string key="NSFrame">{{82, 47}, {249, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="549759153"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -1727,7 +1708,6 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{17, 47}, {36, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="796010464"/>
 													<string key="NSReuseIdentifierKey">_NS:1505</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1745,7 +1725,6 @@
 											</array>
 											<string key="NSFrame">{{0, 377}, {497, 85}}</string>
 											<reference key="NSSuperview" ref="547184945"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="832505845"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<string key="NSClassName">NSView</string>
@@ -1753,7 +1732,6 @@
 									</array>
 									<string key="NSFrame">{{364, 0}, {497, 462}}</string>
 									<reference key="NSSuperview" ref="900503006"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="206159388"/>
 									<string key="NSReuseIdentifierKey">_NS:13</string>
 									<string key="NSClassName">NSView</string>
@@ -1761,7 +1739,6 @@
 							</array>
 							<string key="NSFrameSize">{861, 462}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="916426737"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSIsVertical">YES</bool>
@@ -1770,7 +1747,6 @@
 					</array>
 					<string key="NSFrameSize">{861, 462}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="900503006"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -6941,299 +6917,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">2802</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="nextTrack:">id</string>
-						<string key="playPauseiTunes:">id</string>
-						<string key="previousTrack:">id</string>
-						<string key="quitiTunes:">id</string>
-						<string key="runiTunes:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="nextTrack:">
-							<string key="name">nextTrack:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="playPauseiTunes:">
-							<string key="name">playPauseiTunes:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="previousTrack:">
-							<string key="name">previousTrack:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="quitiTunes:">
-							<string key="name">quitiTunes:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="runiTunes:">
-							<string key="name">runiTunes:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="mainController">MainController</string>
-						<string key="preferencesController">PreferencesController</string>
-						<string key="preferencesWindow">NSWindow</string>
-						<string key="quitWhenAllWindowClosedCheckBox">NSButton</string>
-						<string key="window">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="mainController">
-							<string key="name">mainController</string>
-							<string key="candidateClassName">MainController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="preferencesController">
-							<string key="name">preferencesController</string>
-							<string key="candidateClassName">PreferencesController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="preferencesWindow">
-							<string key="name">preferencesWindow</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="quitWhenAllWindowClosedCheckBox">
-							<string key="name">quitWhenAllWindowClosedCheckBox</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppDelegate.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MainController</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="downloadLyrics:">id</string>
-						<string key="getCurrentSpotifySong:">id</string>
-						<string key="getCurrentiTunesSong:">id</string>
-						<string key="loadNextResults:">id</string>
-						<string key="lyricsSelectionChanged:">NSOutlineView</string>
-						<string key="resetLoadedResults:">id</string>
-						<string key="sendLyricsToiTunes:">id</string>
-						<string key="showLyricsInBrowser:">id</string>
-						<string key="showiLyricsWindow:">id</string>
-						<string key="startNewSearch:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="downloadLyrics:">
-							<string key="name">downloadLyrics:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="getCurrentSpotifySong:">
-							<string key="name">getCurrentSpotifySong:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="getCurrentiTunesSong:">
-							<string key="name">getCurrentiTunesSong:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="loadNextResults:">
-							<string key="name">loadNextResults:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="lyricsSelectionChanged:">
-							<string key="name">lyricsSelectionChanged:</string>
-							<string key="candidateClassName">NSOutlineView</string>
-						</object>
-						<object class="IBActionInfo" key="resetLoadedResults:">
-							<string key="name">resetLoadedResults:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="sendLyricsToiTunes:">
-							<string key="name">sendLyricsToiTunes:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showLyricsInBrowser:">
-							<string key="name">showLyricsInBrowser:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showiLyricsWindow:">
-							<string key="name">showiLyricsWindow:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="startNewSearch:">
-							<string key="name">startNewSearch:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="artistLabel">NSTextField</string>
-						<string key="downloadLyricsButton">NSButton</string>
-						<string key="iLyricsMenuItem">NSMenuItem</string>
-						<string key="loadMoreResultsButton">NSButton</string>
-						<string key="lyricsArea">NSTextView</string>
-						<string key="previewPopover">NSPopover</string>
-						<string key="previewTextArea">NSTextView</string>
-						<string key="resultsOutline">NSOutlineView</string>
-						<string key="searchField">NSSearchField</string>
-						<string key="sendToiTunesButton">NSButton</string>
-						<string key="showPreviewCheckBox">NSButton</string>
-						<string key="songLabel">NSTextField</string>
-						<string key="window">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="artistLabel">
-							<string key="name">artistLabel</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="downloadLyricsButton">
-							<string key="name">downloadLyricsButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="iLyricsMenuItem">
-							<string key="name">iLyricsMenuItem</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="loadMoreResultsButton">
-							<string key="name">loadMoreResultsButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="lyricsArea">
-							<string key="name">lyricsArea</string>
-							<string key="candidateClassName">NSTextView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="previewPopover">
-							<string key="name">previewPopover</string>
-							<string key="candidateClassName">NSPopover</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="previewTextArea">
-							<string key="name">previewTextArea</string>
-							<string key="candidateClassName">NSTextView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="resultsOutline">
-							<string key="name">resultsOutline</string>
-							<string key="candidateClassName">NSOutlineView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="searchField">
-							<string key="name">searchField</string>
-							<string key="candidateClassName">NSSearchField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sendToiTunesButton">
-							<string key="name">sendToiTunesButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="showPreviewCheckBox">
-							<string key="name">showPreviewCheckBox</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="songLabel">
-							<string key="name">songLabel</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MainController.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>
-				<object class="IBPartialClassDescription">
-					<string key="className">PreferencesController</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="changeAutoLyricsInterval:">id</string>
-						<string key="showAutoLyricsPreferences:">id</string>
-						<string key="showGeneralPreferences:">id</string>
-						<string key="toggleAutoLyrics:">id</string>
-						<string key="toggleReplaceOldLyrics:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="changeAutoLyricsInterval:">
-							<string key="name">changeAutoLyricsInterval:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showAutoLyricsPreferences:">
-							<string key="name">showAutoLyricsPreferences:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showGeneralPreferences:">
-							<string key="name">showGeneralPreferences:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleAutoLyrics:">
-							<string key="name">toggleAutoLyrics:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleReplaceOldLyrics:">
-							<string key="name">toggleReplaceOldLyrics:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="autoLyricsView">NSView</string>
-						<string key="generalButton">NSToolbarItem</string>
-						<string key="generalView">NSView</string>
-						<string key="hosterTable">NSTableView</string>
-						<string key="preferencesWindow">PreferencesWindow</string>
-						<string key="replaceOldCheckBox">NSButton</string>
-						<string key="toggleAutoLyricsButton">NSButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="autoLyricsView">
-							<string key="name">autoLyricsView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="generalButton">
-							<string key="name">generalButton</string>
-							<string key="candidateClassName">NSToolbarItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="generalView">
-							<string key="name">generalView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="hosterTable">
-							<string key="name">hosterTable</string>
-							<string key="candidateClassName">NSTableView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="preferencesWindow">
-							<string key="name">preferencesWindow</string>
-							<string key="candidateClassName">PreferencesWindow</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="replaceOldCheckBox">
-							<string key="name">replaceOldCheckBox</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="toggleAutoLyricsButton">
-							<string key="name">toggleAutoLyricsButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PreferencesController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PreferencesWindow</string>
-					<string key="superclassName">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PreferencesWindow.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff --git a/iLyrics/en.lproj/MainMenu.xib b/iLyrics/en.lproj/MainMenu.xib
index 3b01d60..60717ab 100644
--- a/iLyrics/en.lproj/MainMenu.xib
+++ b/iLyrics/en.lproj/MainMenu.xib
@@ -919,9 +919,10 @@
 							<string key="NSToolbarItemPaletteLabel">Search</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSSearchField" key="NSToolbarItemView" id="288810339">
-								<nil key="NSNextResponder"/>
+								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {96, 22}}</string>
+								<reference key="NSSuperview"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSearchFieldCell" key="NSCell" id="48517109">
@@ -1268,7 +1269,7 @@
 															<int key="NSvFlags">4352</int>
 															<string key="NSFrameSize">{300, 415}</string>
 															<reference key="NSSuperview" ref="724400969"/>
-															<reference key="NSNextKeyView" ref="1060229027"/>
+															<reference key="NSNextKeyView" ref="215702022"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTableHeaderView" key="NSHeaderView" id="831140326">
@@ -1437,7 +1438,7 @@
 											</array>
 											<string key="NSFrame">{{0, 29}, {302, 433}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSNextKeyView" ref="215702022"/>
+											<reference key="NSNextKeyView" ref="724400969"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133682</int>
 											<reference key="NSVScroller" ref="1060229027"/>
@@ -1546,7 +1547,9 @@
 																	<integer value="5"/>
 																	<object class="NSURL">
 																		<nil key="NS.base"/>
-																		<string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string>
+																		<object class="NSMutableString" key="NS.relative">
+																			<characters key="NS.bytes">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</characters>
+																		</object>
 																	</object>
 																</array>
 															</array>
@@ -1563,7 +1566,6 @@
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{513, 1}, {15, 361}}</string>
 													<reference key="NSSuperview" ref="681186150"/>
-													<reference key="NSNextKeyView"/>
 													<string key="NSReuseIdentifierKey">_NS:84</string>
 													<reference key="NSTarget" ref="681186150"/>
 													<string key="NSAction">_doScroller:</string>
@@ -2076,7 +2078,7 @@
 				<string key="NSClassName">PreferencesController</string>
 			</object>
 			<object class="NSCustomView" id="226480988">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTextField" id="875967531">
@@ -2111,7 +2113,7 @@
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{424, 146}</string>
 										<reference key="NSSuperview" ref="568651855"/>
-										<reference key="NSNextKeyView" ref="962565179"/>
+										<reference key="NSNextKeyView" ref="25249278"/>
 										<string key="NSReuseIdentifierKey">_NS:13</string>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="1008033059">
@@ -2233,7 +2235,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 173}, {438, 15}}</string>
 								<reference key="NSSuperview" ref="128630455"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:60</string>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="128630455"/>
@@ -2256,7 +2257,7 @@
 						</array>
 						<string key="NSFrame">{{20, 20}, {426, 164}}</string>
 						<reference key="NSSuperview" ref="226480988"/>
-						<reference key="NSNextKeyView" ref="25249278"/>
+						<reference key="NSNextKeyView" ref="568651855"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="NSsFlags">133682</int>
 						<reference key="NSVScroller" ref="962565179"/>
@@ -2292,7 +2293,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{466, 251}</string>
-				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="473254112"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
diff --git a/iLyrics/iLyrics-Prefix.pch b/iLyrics/iLyrics-Prefix.pch
index 8b4020a..7c64e5a 100644
--- a/iLyrics/iLyrics-Prefix.pch
+++ b/iLyrics/iLyrics-Prefix.pch
@@ -5,3 +5,4 @@
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
 #endif
+