Bunch of improvements to content and layout.