Upgrade dynamic form and use gem instead of plugin