revert to pre-merge, fix for home page layout is here
Merge commit 'HEAD@{1}'