Add Cocoon and refactor commit sub-form