Update feed content
Merge branch 'feature/ui'