Modified housing layout.
Merge origin/master