bunch of layout updates'