Fix random organs nested form
Refactor with a partial