refactoring/homepage