Merge pull request #27 from clairs/JOINDIN-257_cleanup_nav

Clean up design