Fixed the menu highlight issues