Fix home
Merge pull request #614 from typesafehub/wip/fix-home

Wip/fix home