fix navi bar css
merge