Fix nav bar logic errors caused by merge conflicts.