CRUD layout fixes