show margins around the editing area
Merge branch 'margins'