Added the delete button
Fixed minibug