Fix navbar and tweak space around icon-user