Refactor - menu