Business Requirements Document as PBI

Hi All,

I have created a requirements document from the PBI which I have created in TFS. Each PBI in the document consists of three parts: ID, description and Acceptance criteria. I just want to know the best practice of the following 2 points:

1- Should I include the screen fields and their properties in the acceptance criteria of each PBI or create 2 section in the document, one for PBI and one for screen fields/fields mapping and refer to the screen fields in the acceptance criteria of each PBI?