more margin fixes