lots of layout cleanup