More margin fixes (3)