Refactor UX to Principles & use Grouped-List template