Fix highlighting of main menu items