Improve inline form