Refactoring view and fleets CRUD