clean up homepage
Merge branch 'master' into layout-cleanup