Just for JZHU
Merge some front page stuff