Restore uniqueness note, minor formatting fixup
Fix image_picker partial to allow for use with or without a FormBuilder