Merge from master

UI Changes (feeds in left side menu etc)