fix page issue and order of home page