Apply the new spacing rules to all blocks based on the work done on https://jira.greenpeace.org/browse/PLANET-3533