Re-design layouts for new content
Merge branch 'hotfix-web-ui' into rails