finished home view
Merge branch 'chris_view'