Further layout tweaks and linkage