Updated with delete button