#118 home page refactoring