Fixed location scaling bug, reduced flashing