Refactoring home page specs