continuing the refactor work, home page close to done