Fix front page data
Major updates including API