Tweak some of the huge margins to be more compact