ECMS-6537: UI implementation