Fix navbar bugs