more menu clean up