improvements in layout