Refactor the form, add remove feature on provider/media