Added the delete button, some cleanup