More bug fixes for container-layout, like whoa