Merge 2 new homepage