Made minor fixes to the menu and highlighting