0026: added delete button and some fixes