Issue: #4

  * Added delete button handling