Better layout margins.
Merge branch 'dev': Better layout margins.