This is actually way more complicated to fix than the submit unit version as this is all laid out with floats. We could potentially do some padding, though that would have knock on effects.
I'm going to tag this as won't fix as it's likely not worth the effort and it shouldn't wrap too often.