Fixed numeration and delete functionality.