Improvements in the layout