Big cleanup for "house" becoming obsolete in 6.0.2
+ get rid of "layout", use template block inheritance (work in progress)