First improvements to layout