Merge pull request #334 from paulej72/master

Fixes for #237 and #326
Small fixes for var edit and monospace fonts