Alter structure so the .grid-wrapper in no inside .inner-block

* as per https://github.com/alphagov/govuk_elements/blob/master/public/sass/elements/_layout.scss#L133