Merge "Update layout and strings for DO Disclosures"