fix feed and default layout.
Merge branch 'hotfix/fix-feed-and-default-layout'