diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ConfigurationDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ConfigurationDialog.java
index bc1f1e1..58dbe7c 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ConfigurationDialog.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ConfigurationDialog.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 import org.timecrafters.TimeCraftersConfigurationTool.R;
 import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend;
 import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialog;
+import org.timecrafters.TimeCraftersConfigurationTool.ui.settings.configurations.ConfigurationsFragment;
 
 public class ConfigurationDialog extends TimeCraftersDialog {
     private static final String TAG = "ConfigurationDialog";
@@ -84,10 +85,9 @@ public class ConfigurationDialog extends TimeCraftersDialog {
                         Backend.instance().writeNewConfig(newConfigName);
                     }
 
+                    // Caution
+                    ((ConfigurationsFragment)getTargetFragment()).populateConfigFiles();
                     dismiss();
-                } else {
-                    // TODO: Show friendly error message
-                    Log.d(TAG, "onClick: InValid");
                 }
             }
         });
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java
index b467eb0..944c2c7 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java
@@ -17,12 +17,8 @@ import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersFragme
 
 public class SettingsFragment extends TimeCraftersFragment {
 
-    private SettingsViewModel settingsViewModel;
-
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        settingsViewModel =
-                ViewModelProviders.of(this).get(SettingsViewModel.class);
         final View root = inflater.inflate(R.layout.fragment_settings, container, false);
         final Button managePresets = root.findViewById(R.id.manage_presets);
         final Button manageConfigurations = root.findViewById(R.id.manage_configurations);
@@ -41,11 +37,6 @@ public class SettingsFragment extends TimeCraftersFragment {
             }
         });
 
-        settingsViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
-            @Override
-            public void onChanged(@Nullable String s) {
-            }
-        });
         return root;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsViewModel.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsViewModel.java
deleted file mode 100644
index adab8d9..0000000
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.timecrafters.TimeCraftersConfigurationTool.ui.settings;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class SettingsViewModel extends ViewModel {
-
-    private MutableLiveData<String> mText;
-
-    public SettingsViewModel() {
-        mText = new MutableLiveData<>();
-        mText.setValue("This is settings fragment");
-    }
-
-    public LiveData<String> getText() {
-        return mText;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java
index 8141527..1e46bb7 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java
@@ -49,7 +49,7 @@ public class ConfigurationsFragment extends TimeCraftersFragment {
         return root;
     }
 
-    private void populateConfigFiles() {
+    public void populateConfigFiles() {
         configsContainer.removeAllViews();
 
         int i = 0;
@@ -82,6 +82,7 @@ public class ConfigurationsFragment extends TimeCraftersFragment {
                 }
             });
 
+            final ConfigurationsFragment fragment = this;
             rename.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -89,7 +90,8 @@ public class ConfigurationsFragment extends TimeCraftersFragment {
                     Bundle bundle = new Bundle();
                     bundle.putString("config_name", configFile);
                     dialog.setArguments(bundle);
-                    dialog.show(getFragmentManager(), null);
+                    dialog.setTargetFragment(fragment, 0);
+                    dialog.show(getFragmentManager().beginTransaction(), "rename_configuration");
                 }
             });