Improved CRUD views