Improved output layout