HMRC prototypes fixes

This is a large number of fixes for the hmrc-prototypes dashboards project.
Fixed. Went wrong in the rebase needed due to fixes you applied with an automated tool. A bit unfortunate that I wasn't prepared for changes to these files, but I guess I'll watch out better next time.