Improved output and display of markup