Layout changes, slightly simplified build.