Improved document lay-out