Margin fixes

More margin fixes.