Fix layout.
Merge branch 'hotfix/layout_extended_view'