fix navbar issues