CL nearly complete, many layout changes