Fix up margins