Removed simple_form and updated forms