Refactored Menu a lot