Moved the menu into a separate class