More verbose modal ids
Restored delete function