Made homepage work
Merge homepage work