More form things

Remove an obsolete form control and use my improved quil-control in its place. Fix words not wrapping in some places.