Improved Formatting of Display