Refactoring home layout