Refactor XML files
Improve Clear and Delete buttons