Better collection controls (surprise!)

- Distinct fields
- Better layout
- Support for localizable text areas (blocked form working by bug 909594)
- Other goodies