Fixing up margins