Correctly highlight menu items