Refactoring home page