Improvements to the layout