Clean up design
Includes removing navigation we won't ever have and making them look nicer [JOINDIN-257]
Merge pull request #27 from clairs/JOINDIN-257_cleanup_nav

Clean up design