Add sidebar
Add newsfeed
Merge branch 'sidebar'