fix navbar bugs, and minor navbar modifications