fix margins
Merge remote-tracking branch 'origin/master' into fix-margins