Fixed font-size issue and remove scaleRedraw