Finished Edit and Delete functionality