Refine layout
Merge branch 'develop'