Improved layouting