Moved custom client and company fields to their respective sections on the PDF