Fix form sortable & add onsubmit event support
Resolve conflicts