Update collection form to be consistent with updated review pages

[howard-e]

Preview Tests

See #1009 and #1010.

This PR updates the collection form's content to align with a subset of recent changes on the review page, introduced by #997.

Note: These changes are branched off of #1012. That PR should be merged before these changes.

[alflennik]

Looks great! I reviewed the preview and I can verify that the collection form now matches what I'm seeing on the latest aria-at-app versions. Code looks good. I have a couple of questions but in general it's looking great.

[alflennik]

Thanks for addressing that feedback!

[stalgiag]

I haven't looked at many of these files in a long time (or ever) so it took me a while to parse what was going on. The code in many of these files feels quite complex due to inline transformation of data to match specific input/output schemas. That said, I think what you have changed here does simplify some of this logic in places which is quite a feat and hopefully part of a gradually move towards simplification and separation of concerns. Most importantly, it does it what it sets out to do (as far as my testing was able to tell)

There is a small merge conflict that needs to be resolved but otherwise I believe this is safe too merge. I am going to approv and hand it back to you for resolving that conflict.

[mcking65]

Looks great, thanks @howard-e !