Refactor home page