Merge pull request #1433 from jjettenn/master

Repair the data set deleter
FIX: added a check when order is null and replaced the modal containers