Fix navbar issues