Improvements to layout and design