Improvements to layout