Move full x/y calcs to AbstractControl
Put dropdown in the right place