Fix Deliver with Econt Layout