fixes paddings and margins
Merge branch 'master' into staging