Improvements in layout