Nav bar edits

This should make it easier to format the navbar