Updated nav styling
Merge branch 'new-nav'