Refactor menu code to Menu-class