Extend screens in simple demo
Extend CRUD demo