Add improvement LEGACY-455

Evenly space top increments
Replace two trailing increments with a single increment
Add check to set whether the controls are enabled