Nav styling
Merge branch 'dev'