ECOM-811 design and layout changes
Merge pull request #6364 from edx/alasdair/decoupled-verified

ECOM-811 design and layout changes