Fixed scaling bug and scales display