Update to use simple_form
Update form helper