new structure and update code for homepage