fix navbar kind of
merge