Enh/scale with zoom

Recreation of #11