refactoring home page :)