Moved child template; removed columnar spans from inline form elements