Further improvements to layout and design