a but of cleanup on the navigation controller
Arrrgh, had to pull lots of code into the droid project as the media player is about to do View stuff
nearly implemented a test but ran out of time