diff --git a/templates/components/heatmap.html b/templates/components/heatmap.html
new file mode 100644
index 0000000..5b50004
--- /dev/null
+++ b/templates/components/heatmap.html
@@ -0,0 +1,60 @@
+{% extends 'index.html' %}
+
+{% block heatmap %}
+
+<div class="flex-fill col-md-4 col-12 card bg-light mb-6">
+    <div class="card-body">
+        <h5 class="card-title">📅 Heatmap</h5>
+        <div id="heatmap"></div>
+    </div>
+</div>
+
+<script>
+
+    // Simulierte Aktivitätsdaten (ersetze dies durch deine echten Daten)
+    const activityData = {{ heatmap_values }};
+
+    // Funktion zum Erstellen der Heatmap
+    function createHeatmap(data) {
+        const heatmapContainer = document.getElementById('heatmap');
+
+        // Aktuelles Datum des Montags
+        const days = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So']
+
+        for (let i = 0; i < 7; i++) {
+            const dayElement = document.createElement('div');
+            dayElement.classList.add('day');
+            dayElement.textContent = days[i];
+            heatmapContainer.appendChild(dayElement);
+            // currentDate.setDate(currentDate.getDate() + 1);
+        }
+
+        // Aktuelles Datum des Montags in der neuen linken Spalte
+        for (let i = 0; i < 7; i++) {
+            for (let j = 0; j < 4; j++) {
+                // console.log(i * 7 + j, data[i * 7 + j], Math.max(...data));
+                const opacity = data[i * 7 + j] / (Math.max(...data) <= 0 ? 1 : Math.max(...data)); // Berechne die Opazität basierend auf Aktivitätsanzahl
+
+                if (data[i * 7 + j]) {
+                    const dayElement = document.createElement('div');
+                    dayElement.classList.add('day');
+                    dayElement.style.backgroundColor = `rgba(0, 255, 0, ${opacity})`;
+                    heatmapContainer.appendChild(dayElement);
+                } else {
+                    const dayElement = document.createElement('div');
+                    dayElement.classList.add('day');
+                    dayElement.style.backgroundColor = `rgba(0, 255, 0, ${opacity})`;
+                    heatmapContainer.appendChild(dayElement);
+                }
+            }
+        }
+
+        var left = 7 - (new Date()).getDay();
+    }
+
+    // Erstelle die Heatmap mit den simulierten Daten
+    createHeatmap(activityData);
+
+</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 489a930..54961bd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,7 +1,8 @@
 {% extends 'layouts/main.html' %}
 
 {% block content %}
-<h1>{{ title }}</h1>
+<h1> <img class="avatar avatar-xl" src="{{user.profile_image}}"/>
+    {{ title }}</h1>
 <h3>{{ utc_dt }}</h3>
 
 
@@ -25,11 +26,11 @@
     }
 </style>
 
-<div class="d-flex flex-column gap-5">
-    <div class="d-flex gap-3">
-        <div class="flex-md-fill col-md-4 col-12 card bg-light mb-6">
+
+    <div class="d-md-flex gap-3">
+        <div class="flex-fill col-md-4 col-12 card bg-light mb-6">
             <div class="card-body">
-                <h5 class="card-title">Heatmap</h5>
+                <h5 class="card-title">📅 Heatmap</h5>
                 <div id="heatmap"></div>
             </div>
         </div>
@@ -85,94 +86,82 @@
 
         <div class="flex-fill col-md-8 col-12 card bg-light p-6 mb-6">
             <div class="row mb-3">
-                <h2 class="col-9">Gewohnheiten</h2>
+                <h5 class="col-9">📋 Gewohnheiten</h5>
                 <a class="col-3 btn btn-primary p" role="button" href="/habit-list">Neue Liste erstellen</a>
             </div>
 
 
-            <div class="card-header">
-                <ul class="nav nav-tabs card-header-tabs">
 
-                    {% for habit_list in habit_lists %}
-                    <li class="nav-item">
-                        {% if habit_list == habit_lists[0] %}
-                        <a class="nav-link active" aria-current="true">{{ habit_list.name }}</a>
-                        {% else %}
-                        <a class="nav-link">{{ habit_list.name }}</a>
-                        {% endif %}
+            <ul class="nav nav-tabs card-header-tabs" role="tablist">
+                {% for habit_list in habit_lists %}
 
-                    </li>
-                    {% endfor %}
-
-                </ul>
-            </div>
-
-            <div class="card-body text-center">
-                <h5 class="card-title">Special title treatment</h5>
-                <p class="card-text">
-                    With supporting text below as a natural lead-in to additional content.
-                </p>
-            </div>
-
-
-            {% for habit_list in habit_lists %}
-
-            <div class="row mb-3">
-                <h2 class="col-9">{{ habit_list.name }}</h2>
-                <a class="col-3 btn btn-primary" role="button" href="/habit?list={{ habit_list.id }}">Gewohnheit
-                    erstellen</a>
-            </div>
-
-            <ul class="task-list row">
-                {% for habit in habit_list.habits %}
-                <li class="row d-flex align-items-center mb-2" id="habit-{{ habit.id }}">
-                    <div class="col-auto drag-handle" style="cursor: grab;">
-                        <i class="bi bi-grip-vertical"></i>
-                    </div>
-                    <div class="col-auto">
-                        <input {% if habit.checked %} checked {% endif %} type="checkbox" class="task-checkbox"
-                               id="{{ habit.id }}"
-                               onclick="sendPostRequest('{{ habit.id }}')">
-                    </div>
-
-                    <div class="col" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
-                        {{ habit.name }}
-                    </div>
-
-                    <div class="col-5 text-black text-opacity-50"
-                         style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
-                        {{ habit.note }}
-
-                    </div>
-
-                    <div class="col-2" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
-                        {% if habit %}
-
-                        {% else %}
-                        5 🔥
-                        {% endif %}
-
-                    </div>
-
-                    <button type="button" class="btn btn-xs btn-danger rounded-circle" data-bs-toggle="modal"
-                            data-bs-target="#exampleModal" style="width: 40px; height: 40px"
-                            onclick="setSelectedHabitId({{ habit.id }})">
-                        <i class="bi bi-trash3"></i>
-                    </button>
-                    <div class="col-12">
-                        <div class="progress" style="height: 2px; width: 90%">
-                            <div class="progress-bar" id="progress-bar-{{ habit.id }}" role="progressbar"
-                                 style="width: {{ habit.percentage }}%; background-color: {% if habit.percentage >= 100 %} green {% else %} primary {% endif %}"
-                                 aria-valuenow="{{ habit.percentage }}" aria-valuemin="0"
-                                 aria-valuemax="100"></div>
-                        </div>
-                    </div>
+                <li class="nav-item" role="presentation">
+                    <a class="nav-link {% if habit_list == habit_lists[0] %} active {% endif %}" id="simple-tab-{{habit_list.id}}" data-bs-toggle="tab" href="#simple-tabpanel-{{habit_list.id}}" role="tab" aria-controls="simple-tabpanel-{{habit_list.id}}" aria-selected="true">
+                        {{habit_list.name}}
+                    </a>
                 </li>
-
                 {% endfor %}
             </ul>
+            <div class="tab-content pt-5" id="tab-content">
+                {% for habit_list in habit_lists %}
+                <div class="tab-pane {% if habit_list == habit_lists[0] %} active {% endif %}" id="simple-tabpanel-{{habit_list.id}}" role="tabpanel" aria-labelledby="simple-tab-{{habit_list.id}}">
+                    <div class="row mb-3">
+                        <h2 class="col-9"></h2>
+                        <a class="col-3 btn btn-primary" role="button" href="/habit?list={{ habit_list.id }}">
+                            Gewohnheit erstellen
+                        </a>
+                    </div>
+
+                    <ul class="task-list row">
+                        {% for habit in habit_list.habits %}
+                        <li class="row d-flex align-items-center mb-2" id="habit-{{ habit.id }}">
+                            <div class="col-auto drag-handle" style="cursor: grab;">
+                                <i class="bi bi-grip-vertical"></i>
+                            </div>
+                            <div class="col-auto">
+                                <input {% if habit.checked %} checked {% endif %} type="checkbox" class="task-checkbox"
+                                       id="{{ habit.id }}"
+                                       onclick="sendPostRequest('{{ habit.id }}')">
+                            </div>
+
+                            <div class="col" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+                                {{ habit.name }}
+                            </div>
+
+                            <div class="col-5 text-black text-opacity-50"
+                                 style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+                                {{ habit.note }}
+
+                            </div>
+
+                            <div class="col-2" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+                                {% if not habit.streak == 0 %}
+                                {{ habit.streak }} 🔥
+                                {% endif %}
+
+                            </div>
+
+                            <button type="button" class="btn btn-xs btn-danger rounded-circle" data-bs-toggle="modal"
+                                    data-bs-target="#exampleModal" style="width: 40px; height: 40px"
+                                    onclick="setSelectedHabitId({{ habit.id }})">
+                                <i class="bi bi-trash3"></i>
+                            </button>
+                            <div class="col-12">
+                                <div class="progress" style="height: 2px; width: 90%">
+                                    <div class="progress-bar" id="progress-bar-{{ habit.id }}" role="progressbar"
+                                         style="width: {{ habit.percentage }}%; background-color: {% if habit.percentage >= 100 %} green {% else %} primary {% endif %}"
+                                         aria-valuenow="{{ habit.percentage }}" aria-valuemin="0"
+                                         aria-valuemax="100"></div>
+                                </div>
+                            </div>
+                        </li>
+
+                        {% endfor %}
+                    </ul>
+                </div>
+                {% endfor %}
+            </div>
 
-            {% endfor %}
         </div>
 
         <script>
@@ -270,7 +259,7 @@
             }
         </script>
     </div>
-</div>
+
 
 <script>
     document.addEventListener('DOMContentLoaded', (event) => {