new home page and better strucute