diff --git a/app/apps/dca/views.py b/app/apps/dca/views.py
index 0234f68..319a76f 100644
--- a/app/apps/dca/views.py
+++ b/app/apps/dca/views.py
@@ -76,7 +76,7 @@ def strategy_edit(request, strategy_id):
     return render(
         request,
         "dca/fragments/strategy/edit.html",
-        {"form": form, "dca_strategy": dca_strategy},
+        {"form": form, "strategy": dca_strategy},
     )
 
 
@@ -206,7 +206,7 @@ def strategy_entry_edit(request, strategy_id, entry_id):
 
     return render(
         request,
-        "dca/fragments/strategy/edit.html",
+        "dca/fragments/entry/edit.html",
         {"form": form, "dca_entry": dca_entry},
     )
 
diff --git a/app/templates/dca/fragments/entry/edit.html b/app/templates/dca/fragments/entry/edit.html
index 17f3eee..f16ea29 100644
--- a/app/templates/dca/fragments/entry/edit.html
+++ b/app/templates/dca/fragments/entry/edit.html
@@ -5,7 +5,7 @@
 {% block title %}{% translate 'Edit DCA entry' %}{% endblock %}
 
 {% block body %}
-<form hx-post="{% url 'exchange_rate_edit' pk=exchange_rate.id %}" hx-target="#generic-offcanvas" novalidate>
+<form hx-post="{% url 'dca_entry_edit' entry_id=dca_entry.id strategy_id=dca_entry.strategy.id %}" hx-target="#generic-offcanvas" novalidate>
     {% crispy form %}
 </form>
 {% endblock %}
diff --git a/app/templates/dca/fragments/strategy/details.html b/app/templates/dca/fragments/strategy/details.html
index 4ea6672..5071fb9 100644
--- a/app/templates/dca/fragments/strategy/details.html
+++ b/app/templates/dca/fragments/strategy/details.html
@@ -198,7 +198,6 @@
 </div>
 
 <script defer>
-    // Add Chart.js initialization for performance visualization
     var perfomancectx = document.getElementById('performanceChart').getContext('2d');
     new Chart(perfomancectx, {
         type: 'line',
diff --git a/app/templates/dca/fragments/strategy/edit.html b/app/templates/dca/fragments/strategy/edit.html
index b449951..fa26a52 100644
--- a/app/templates/dca/fragments/strategy/edit.html
+++ b/app/templates/dca/fragments/strategy/edit.html
@@ -5,7 +5,7 @@
 {% block title %}{% translate 'Edit DCA strategy' %}{% endblock %}
 
 {% block body %}
-<form hx-post="{% url 'dca_entry_edit' entry_id=dca_entry.id strategy_id=dca_entry.strategy.id %}" hx-target="#generic-offcanvas" novalidate>
+<form hx-post="{% url 'dca_strategy_edit' strategy_id=strategy.id %}" hx-target="#generic-offcanvas" novalidate>
     {% crispy form %}
 </form>
 {% endblock %}