Switched from table to embedded field collection widget. Fixes #184