Menu cleanup and milestones update