Added delete button
Merged changes