Moved the form into a partial
created a partial for match form