Styling

Re-styled navbar.  Also fixed merge conflicts.