Split govuk pubs scripts + small improvements