Improved formatting of individual page