working navbar
merge