Merge "Refactor Handle Menu as Single Window" into main