Major refactor of home page and helpers