Homepage view
Resolved merge conflict
Progress on homepage view