Work on nav controller dispatcher and hookup menu button states. Cleanup.