re tweaks to layout and content ordering