Kad refactoring nav bar

Emma, note that this broke the styles. Sorry!