fix navigationbar
design fix
Merge branch 'master' into HEAD