Reverted moving living with to a new screen, and just moved to a new panel
Commit
Merge branch 'master' of https://github.com/invertedtomato/ChERP