updates to support homepage and individual view
Merge remote-tracking branch 'origin/master'