More CSSLayout editor work