more makeup on layouts
Merge branch 'develop'