Modify form to use docking fields