Added ability to delete and edit