Make first page use correct data…

…as much as possible.

Also does more more spacing tweaks.
Merge pull request #27 from alphagov/first-page

Make first page use correct data…