Slight Changes to Menu Class