more layout changes