Tweak some padding and margins