refactoring
working on page 3
refactor home page