Update the homepage

Finished with work. Merging back to master