Refactoring form partial page