Better arrangement of stratified layouts.

Also fixed bug with compare.