Content and styling tweaks