lots of layout updates