Fix home

/cc @dgageot @mattmoor 
Fixes #12
Closes #13 and #14