ECMS-3197 Refactor to use new UI components