RW: more layout changes