Added delete functionality and cleaned up the UI a bit