Swap extra property order
Draw using settings for scales