Refacto home

Loads of improvements.