Update to Edit, New views. Update to collaborator and view controllers