adjust sizes and margins
Merge branch 'work'