Merge pull request #76 from jonsimington/home-rework

Homepage rework