Removed some hardcoding in the form.