Refactored Menu Changes