Style sdjustments and use setGutterMarker
Tweak to overflow
Use cleargutter
restructure files a little