Rearrange menu items
Merge branch 'nav-bar'
Make taking a quiz look a little nicer