Better layout, but needs the forms wrapped in a test to hide them on documents.