Rebuilt Layout... Again! This time, really good build.