some improvements to layout