Better Nav bar

fixed it
All caps

It looks nicer this way
Fixed conflicts - 2