Tweaks to print more headers and use fixed-width font