Changed display font to Courier New, removed spaces.
Merge origin/master