Terrible layouts are pretty much done