Add padding for spans
Removing overs for now, until they are reconfigured to work with full spans