Refactor home and header module