feat: Refactoring form partials and adding shared form controls