Undoing some of my over-architecting from a couple years back. Also showing more items on the homepage.