More margin fixes