Add a field to the top, asking if agreement is Contract, R&P or other. Move effective date to second field from top. Then Company Name. Then authorized contact info for name, email, phone and job title. then the rest is billing info.