improve layout
Merge branch 'release/v2'