Homepage main content complete
Merge branch 'main-content'