Update FormHelper - Should be ok for almost everything.