--Delete, edit logic and views added to client --