Fix up margins again