Continued work on navigation layout. Updated TODO.