Fix navbar and tweak space around icon-user
Merge branch 'fix-navbar'