even more layout changes