style nav bar elements and shift buttons
fix merge conflicts
Merge pull request #32 from jsum528/nav-bar

Nav bar