more layout changes, etc