lot of layout fixes and tweaks
some new