Working on the layout...
Merge branch 'develop'