Margin fixes
Merge pull request #2877 from nicolaasmatthijs/marginFixes

Margin fixes