Whitehouse redesign (Fixes #529)