fix navbar bugs