diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.nib/designable.nib
index 870446c..15f91f8 100644
--- a/English.lproj/MainMenu.nib/designable.nib
+++ b/English.lproj/MainMenu.nib/designable.nib
@@ -9,7 +9,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="29"/>
-			<integer value="371"/>
+			<integer value="372"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -388,7 +388,7 @@
 			<object class="NSCustomObject" id="589998182">
 				<string key="NSClassName">RyderController</string>
 			</object>
-			<object class="NSUserDefaultsController" id="1019343853">
+			<object class="NSUserDefaultsController" id="772382987">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>windowHeight</string>
@@ -496,14 +496,6 @@
 					</object>
 					<int key="connectionID">390</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="972006081"/>
-						<reference key="destination" ref="589998182"/>
-					</object>
-					<int key="connectionID">392</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">enableSpeech:</string>
@@ -528,22 +520,14 @@
 					</object>
 					<int key="connectionID">438</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="589998182"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">439</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentWidth: values.windowWidth</string>
 						<reference key="source" ref="972006081"/>
-						<reference key="destination" ref="1019343853"/>
+						<reference key="destination" ref="772382987"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="972006081"/>
-							<reference key="NSDestination" ref="1019343853"/>
+							<reference key="NSDestination" ref="772382987"/>
 							<string key="NSLabel">contentWidth: values.windowWidth</string>
 							<string key="NSBinding">contentWidth</string>
 							<string key="NSKeyPath">values.windowWidth</string>
@@ -552,6 +536,22 @@
 					</object>
 					<int key="connectionID">447</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="972006081"/>
+						<reference key="destination" ref="589998182"/>
+					</object>
+					<int key="connectionID">448</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="589998182"/>
+						<reference key="destination" ref="972006081"/>
+					</object>
+					<int key="connectionID">449</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -822,7 +822,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">440</int>
-						<reference key="object" ref="1019343853"/>
+						<reference key="object" ref="772382987"/>
 						<reference key="parent" ref="1049"/>
 					</object>
 				</object>
@@ -1017,7 +1017,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">447</int>
+			<int key="maxID">449</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index faa546c..b7fedea 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/RyderController.h b/RyderController.h
index 93fbd92..17cede1 100644
--- a/RyderController.h
+++ b/RyderController.h
@@ -28,9 +28,6 @@
 -(IBAction)newName:(id)sender;
 -(IBAction)enableSpeech:(NSButton*)sender;
 
--(void)applicationWillFinishLaunching:(NSNotification*)notification;
--(BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)theApplication;
-
 // In Interface Builder, make a 'delegate' connection
 // from File's Owner to Ryder Controller.
 
diff --git a/RyderController.m b/RyderController.m
index 678a11f..9c623b4 100644
--- a/RyderController.m
+++ b/RyderController.m
@@ -3,6 +3,7 @@
 //  (c) 2008-2009 Liam Cooke
 //  MIT Licensed -- see LICENSE.txt
 
+#import <QuartzCore/QuartzCore.h>
 #import "RyderController.h"
 #import "RyderNamer.h"
 
@@ -14,7 +15,8 @@ @implementation RyderController
 
 -(id)init
 {
-	if (self = [super init]) {
+    self = [super init];
+	if (self) {
 		ryder = [[RyderNamer alloc] init];
 		
 		speechEnabled = NO;  //[[NSUserDefaults standardUserDefaults] boolForKey:speakNames];
@@ -67,13 +69,17 @@ -(IBAction)enableSpeech:(NSButton*)sender
 
 -(void)awakeFromNib
 {
+    [window setDelegate:self];
     [window center];
 }
 
 -(void)applicationWillFinishLaunching:(NSNotification*)notification
 {
     PFMoveToApplicationsFolderIfNecessary();
+    
+    [window setAlphaValue:0.0];
     [window makeKeyAndOrderFront:self];
+    [window.animator setAlphaValue:1.0];
 }
 
 -(BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)theApplication
@@ -81,4 +87,10 @@ -(BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)theApplic
 	return YES;
 }
 
+-(BOOL)windowShouldClose:(id)theWindow
+{
+    //[window.animator setAlphaValue:0.0];
+    return YES;
+}
+
 @end