Flatten unnecessary div nesting

On reviewing the diff between master and this branch I've noticed we've
ended up with two new divs where one would suffice.