Improvement to layout