Clean up design
Includes removing navigation we won't ever have and making them look nicer [JOINDIN-257]