Made homepage modular
Merged homepage template