FIX: added a check when order is null and replaced the modal containers
Merge pull request #1439 from jjettenn/master

FIX: added a check when order is null and replaced the modal containers