More margin fixes

Yay