Bunch of fixes - Canvas and zoom-range smaller