Updated CRUD and View