work on home and goal pages