Added delete buttons.
Merge pull request
Added new popup template.