Refactored menu transition