Improved delete functionality on frontend