Final layout tweaks before spin review