ECOM-811 design and layout changes