Moved more code to Menu class