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

Related to LL68