fixed layout on navbar
Merge branch 'master' into br0411v2