lots of layout tweaks in prep for handover