Cleanup and Highlight menu item