diff --git a/templates/workout_view.html b/templates/workout_view.html
index 0005b60..3f054d9 100644
--- a/templates/workout_view.html
+++ b/templates/workout_view.html
@@ -1,8 +1,8 @@
 <div class="flex justify-center pt-4 px-4">
     <div class="mb-3 w-full md:w-1/3">
-        <select id="multiSelection" data-te-select-init name="graph_types" class="mx-auto w-full" multiple
+        <select id="multiSelection-{{ workout.id }}" data-te-select-init name="graph_types" class="mx-auto w-full" multiple
             hx-trigger="change" hx-get="{{ url_for('view_workout', user_id=workout.user_id, workout_id=workout.id) }}"
-            hx-target="#workout_view">
+            hx-target="#workout_view-{{ workout.id }}">
             <option value="cadence" {% if 'cadence' in graph_types %} selected {% endif%}>Cadence</option>
             <option value="speed" {% if 'speed' in graph_types %} selected {% endif%}>Speed</option>
             <option value="power" {% if 'power' in graph_types %} selected {% endif%}>Power</option>
@@ -12,7 +12,7 @@
     </div>
 </div>
 <script>
-    te.Select.getOrCreateInstance(document.querySelector("#multiSelection")).setValue({{ graph_types| safe }});
+    te.Select.getOrCreateInstance(document.querySelector("#multiSelection-{{ workout.id }}")).setValue({{ graph_types| safe }});
 </script>
 
 {% for graph_type in graph_types %}
diff --git a/templates/workouts_list.html b/templates/workouts_list.html
index c4ff3e0..7b00068 100644
--- a/templates/workouts_list.html
+++ b/templates/workouts_list.html
@@ -19,15 +19,7 @@
         </button>
     </h2>
     <div class="!visible collapse {% if loop.index  != 1 %}hidden{% endif %}">
-        <!--
-        <img src="{{ url_for('workout', user_id=w.user_id, workout_id=w.id, graph_type='cadence') }}" loading="lazy"
-            alt="No image" class="mx-auto">
-        <img src="{{ url_for('workout', user_id=w.user_id, workout_id=w.id, graph_type='speed') }}" loading="lazy"
-            alt="No image" class="mx-auto">
-        <img src="{{ url_for('workout', user_id=w.user_id, workout_id=w.id, graph_type='power') }}" loading="lazy"
-            alt="No image" class="mx-auto">
-        -->
-        <div id="workout_view">
+        <div id="workout_view-{{ w.id }}">
             {% with workout=w, graph_types=['speed'] %}
             {% include 'workout_view.html' %}
             {% endwith %}