refactored partials forms