Updated forms, added simple_form