Final content and layout tweaks