diff --git a/TODO.txt b/TODO.txt
index cddb61afd..1d5026f03 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,13 +2,10 @@
 
 NEXT:
 - prepare WiiMoteDemo for release
-  - auto-select Wiimote with name "Nintendo RVL-CNT-01"
-  - disable selection button
-  - disable back button in GL view somehow
+  - update text shown during connect
 - improve user experience of BTstack Inquiry View
   - shorter inquiry interval
   - repeat inquiry while BT on
-  - allow to select device and stop inquiry
 - CocoaTouch user interface
   - add bluetooth on/off toggle
   - on iPhone sleep, just turn off Bluetooth and disconnect all connections
diff --git a/example/WiiMoteOpenGLDemo/Classes/EAGLViewController.m b/example/WiiMoteOpenGLDemo/Classes/EAGLViewController.m
index 326a40a61..98e3c112a 100644
--- a/example/WiiMoteOpenGLDemo/Classes/EAGLViewController.m
+++ b/example/WiiMoteOpenGLDemo/Classes/EAGLViewController.m
@@ -15,7 +15,10 @@
     self.view = view;
     [view release];
 	
-	self.title = @"WiiMote";
+	self.title = @"BTstack WiiMote Demo";
+
+	// disable back button
+	self.navigationItem.hidesBackButton = TRUE; 
 }
 // Override to allow orientations other than the default portrait orientation.
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {