navbar not clean yet
merge navbar