Add hotfixes for layout.
Merge branch 'hotfix-design'