Content, and design tweaks