Homepage refactor