finished homepage
merge