more improvements to layout