Updated home view
Merge branch 'develop'