Added delete button & other minor changes