inline form on edit client
Merge branch '2-column-form'