Subforms that require extra click to add it's content to main form should be replaced by popups that, when submitted, should add data directly to form.
This is needed to avoid confusing extra click that is needed to process entered data on create/update.