Fix nav bar inconsistencies