Merge "Refactor Handle Menu Code for Clarity" into main