ADDED delete button
few FIXES