Merge branch 'feature/layout' to develop