[WIP] Sale layout changes