fixed dependent OR fields, continued to finalise content and layout