Few more tweaks on the road

legend font size
backport some editor fixes