Change full layout to cond layout in a few spots