Layout optimization
Merge branch 'dev'