Home screen refactoring