diff --git a/templates/person_overview.html b/templates/person_overview.html
index 8fd729c..80208c7 100644
--- a/templates/person_overview.html
+++ b/templates/person_overview.html
@@ -159,11 +159,16 @@
     </div>
 </div>
 
-{{ render_partial('partials/stats.html', stats=stats) }}
+{% endblock %}
 
+{% block stats %}
+{{ render_partial('partials/stats.html', stats=stats) }}
+{% endblock %}
+
+{% block add_workout_button %}
 <button
     class="fixed z-90 bottom-10 right-8 bg-blue-600 w-20 h-20 rounded-full drop-shadow-lg flex justify-center items-center text-white text-4xl hover:bg-blue-700 hover:drop-shadow-2xl hover:animate-bounce duration-300"
-    hx-post="{{ url_for('create_workout', person_id=person_id) }}" hx-target='body' hx-swap='beforeend'>
+    hx-post="{{ url_for('create_workout', person_id=person_id) }}" hx-push-url="true" hx-target="#container">
     <svg viewBox="0 0 20 20" enable-background="new 0 0 20 20" class="w-6 h-6 inline-block">
         <path fill="#FFFFFF" d="M16,10c0,0.553-0.048,1-0.601,1H11v4.399C11,15.951,10.553,16,10,16c-0.553,0-1-0.049-1-0.601V11H4.601
                                 C4.049,11,4,10.553,4,10c0-0.553,0.049-1,0.601-1H9V4.601C9,4.048,9.447,4,10,4c0.553,0,1,0.048,1,0.601V9h4.399