Refactor - Main menu in manager