Round 7 layout changes