Improved output layout.