WIP: last-minute layout tweaks