Modification to incorporate form partial and validation