first pass of home tab refactor