Merge branch 'release/1.0-beta-1.1'
Fix layout.
Merge branch 'hotfix/layout_extended_view' into develop