some more layout changes