Several improvements added on forms.