Fixing navigation styles so everything fits on one line
Merge branch 'develop'