Added delete edit button to the UI. Also, added delete functionality.
Merged from origin