Slight refactor in House and GUI and code clean up.