Fix new configuration creation and edit mode