diff --git a/myLauncher/Classes/AppDelegate.m b/myLauncher/Classes/AppDelegate.m
index 0e8d075..f7f432a 100644
--- a/myLauncher/Classes/AppDelegate.m
+++ b/myLauncher/Classes/AppDelegate.m
@@ -37,7 +37,7 @@ - (void)applicationDidFinishLaunching:(UIApplication*)application
 							[[RootViewController alloc] init]];
 	navigationController.navigationBar.tintColor = COLOR(2, 100, 162);
 	
-    [window addSubview:navigationController.view];
+    [window setRootViewController:navigationController];
     [window makeKeyAndVisible];
     [window layoutSubviews];    
 }
diff --git a/myLauncher/Classes/MyLauncher/MyLauncherView.h b/myLauncher/Classes/MyLauncher/MyLauncherView.h
index 1c5b99a..7344eeb 100644
--- a/myLauncher/Classes/MyLauncher/MyLauncherView.h
+++ b/myLauncher/Classes/MyLauncher/MyLauncherView.h
@@ -49,7 +49,7 @@
 
 @property (nonatomic) BOOL editingAllowed;
 @property (nonatomic) NSInteger numberOfImmovableItems;
-@property (nonatomic, strong) id <MyLauncherViewDelegate> delegate;
+@property (nonatomic, unsafe_unretained) id <MyLauncherViewDelegate> delegate;
 @property (nonatomic, strong) MyLauncherScrollView *pagesScrollView;
 @property (nonatomic, strong) MyLauncherPageControl *pageControl;
 @property (nonatomic, strong) NSMutableArray *pages;
diff --git a/myLauncher/Classes/MyLauncher/MyLauncherViewController.m b/myLauncher/Classes/MyLauncher/MyLauncherViewController.m
index 6b1d649..e52a9a2 100644
--- a/myLauncher/Classes/MyLauncher/MyLauncherViewController.m
+++ b/myLauncher/Classes/MyLauncher/MyLauncherViewController.m
@@ -113,6 +113,10 @@ - (void)viewDidUnload {
     [super viewDidUnload];
 }
 
+- (void)dealloc {
+    _launcherView.delegate = nil;
+}
+
 #pragma mark - MyLauncherItem management
 
 -(BOOL)hasSavedLauncherItems {