Round 6 layout changes