Remove container and use inline form