Update front page
merge front page