Fixed "highlighted" menu bar to show correct selection