Better organisation for Custom Field

Currently, custom fields are all bulked together, even if they’re on randomly different topics. Additionally, they all appear at the start of a Fact Find Snapshot, and it looks really nonsensical. It would be better if you could categorise where to put the custom fields so they appear in the relevant sections.