Hello Darren, I did next changes for the MyAssays.MatrixTransform.EditorControl.Component project last week: 1. Moved each View models in separate folders Before ![image](https://user-images.githubusercontent.com/9796687/201699856-23e2de25-5530-4ae8-b4ae-be3917ea5e59.png) After ![image](https://user-images.githubusercontent.com/9796687/201699910-4d8805ab-0c31-4621-bf42-a0cbb224e8db.png) 2. Move styles from local resources to separate Resource dictionary file Before ![image](https://user-images.githubusercontent.com/9796687/201699987-5e19a5ae-c682-417a-b3b7-9be130a13836.png) After ![image](https://user-images.githubusercontent.com/9796687/201700046-8514c1e6-d7bc-4ea4-a808-6ff26e24a26d.png) 3. High level refactoring of each section (ViewModels, Views) 4. Removed reflection usage in Report Section View Model. Instead using generic types 5. Customize title for each section I need only fix one more bug and expect to finish it and send it to code review tomorrow. Regards, Maksym Khomyn