ECOM-851 added margin and padding