Added circle and triangle, fixed validation to work on all forms.