Changed scaling options

Reworked scaling as discussed in the meeting