Improved options form.