some improvements of layout