fix padding and margins
Merge branch 'dev'