Refactor

Made partials for duplicate form options