more layout changes --KW