fix panel on house views
merge conflicts