Updated forms on frontend

Updated the forms on the frontend to work properly with the updated
form.class.