Added cancel and delete buttons