Fixed scaling and smoothing issues