Moved delete functionality to single dialog box
Merge conflict