diff --git a/app.py b/app.py
index 7b3e91e..bc5b2cd 100644
--- a/app.py
+++ b/app.py
@@ -543,6 +543,16 @@ def add_user():
     if user.id == current_user.id:
         errors['email'] = 'Du kannst dich nicht selbst hinzufügen.'
 
+    # Check if user is already in the habit list
+    already = False
+    for u in habit_list.get_users():
+        if u.id == user.id:
+            already = True
+            break
+
+    if already:
+        errors['email'] = 'Teilnehmer ist bereits in der Liste.'
+
     if errors:
         return render_template(
             'users.html',
@@ -557,14 +567,7 @@ def add_user():
     habit_list = HabitList.get(int(habit_list_id))
     habit_list.add_user(user)
 
-    return render_template(
-        'users.html',
-        title='Teilnehmer',
-        habit_list=habit_list,
-        users=habit_list.get_users(),
-        errors={},
-        email=email,
-    )
+    return redirect(url_for('index', habit_list=habit_list.id))
 
 
 # Run the application
diff --git a/models/HabitList.py b/models/HabitList.py
index e20ac25..1346390 100644
--- a/models/HabitList.py
+++ b/models/HabitList.py
@@ -53,15 +53,14 @@ class HabitList:
         raw_users = get_users(self.id)
         users = []
         for user in raw_users:
-            user = User(user[0], user[1], user[2], user[3])
+            user = User(user[0], user[1], user[2], user[3], user[4])
             users.append(user)
 
         return users
 
 
     # Adds a User by email to the HabitList
-    def add_user(self, email: str):
-        user = User.get_by_email(email)
+    def add_user(self, user: User):
         if user:
             add_user(self.id, user.id)
         else:
diff --git a/templates/components/habit_lists.html b/templates/components/habit_lists.html
index 06dcb9d..d6892e8 100644
--- a/templates/components/habit_lists.html
+++ b/templates/components/habit_lists.html
@@ -66,17 +66,18 @@
             <div class="row mb-3 align-items-center">
 
                 <!-- Personen die zur Liste gehören -->
-                <div class="col-2">
+                <div class="col">
                     <div class="avatar-stack">
-                        <img class="avatar" src="/images/avatar/1.jpg"/>
-                        <img class="avatar" src="/images/avatar/2.jpg"/>
-                        <img class="avatar" src="/images/avatar/4.jpg"/>
-                        <img class="avatar" src="/images/avatar/5.jpg"/>
+                        {% for user in habit_list.get_users() %}
+                        {% if current_user.id != user.id %}
+                        <img class="avatar" src="/{{user.profile_image}}" data-toggle="tooltip" data-placement="top" title="{{user.name}}"/>
+                        {% endif %}
+                        {% endfor %}
                     </div>
                 </div>
 
                 <!-- Knopf für das Hinzufügen einer Person zur gemeinsamen Liste -->
-                <div class="col-1">
+                <div class="col">
                     <a href="/users?habit_list={{habit_list.id}}" style="width: 40px; height: 40px; min-height: 3em;">
 
                         <i class="bi bi-plus-circle"></i>
diff --git a/templates/components/scripts.html b/templates/components/scripts.html
index 161588d..c05ac07 100644
--- a/templates/components/scripts.html
+++ b/templates/components/scripts.html
@@ -1,81 +1,80 @@
-
 <script>
-            function checkCompletionAndAnimate(habitId, percentage) {
-                var progressBar = document.getElementById("progress-bar-" + habitId);
-                var habitBlock = document.getElementById("habit-" + habitId);
+    function checkCompletionAndAnimate(habitId, percentage) {
+        var progressBar = document.getElementById("progress-bar-" + habitId);
+        var habitBlock = document.getElementById("habit-" + habitId);
 
-                if (percentage === 100) {
-                    progressBar.style.backgroundColor = "green";
-                    habitBlock.classList.add("animate-bounce");
-                    setTimeout(function () {
-                        habitBlock.classList.remove("animate-bounce");
-                    }, 2000);
-                } else {
-                    progressBar.style.backgroundColor = "";
-                    habitBlock.classList.remove("animate-bounce");
-                }
+        if (percentage === 100) {
+            progressBar.style.backgroundColor = "green";
+            habitBlock.classList.add("animate-bounce");
+            setTimeout(function () {
+                habitBlock.classList.remove("animate-bounce");
+            }, 2000);
+        } else {
+            progressBar.style.backgroundColor = "";
+            habitBlock.classList.remove("animate-bounce");
+        }
+    }
+
+    function sendPostRequest(checkboxId) {
+        // Get the checkbox element using the provided ID
+        var checkbox = document.getElementById(checkboxId);
+        // console.log(checkbox);
+
+        // Get the habit id from the checkbox id attribute
+        var habitId = checkboxId;
+
+        // Make a POST request to /check with the habit id
+        axios.post('/check', {habitId: habitId}, {
+            headers: {
+                'Content-Type': 'application/json'
             }
-
-            function sendPostRequest(checkboxId) {
-                // Get the checkbox element using the provided ID
-                var checkbox = document.getElementById(checkboxId);
-                // console.log(checkbox);
-
-                // Get the habit id from the checkbox id attribute
-                var habitId = checkboxId;
-
-                // Make a POST request to /check with the habit id
-                axios.post('/check', {habitId: habitId}, {
-                    headers: {
-                        'Content-Type': 'application/json'
-                    }
-                }).then(function (response) {
-                    // Handle the success response if needed
-                    console.log(response.data);
+        }).then(function (response) {
+            // Handle the success response if needed
+            console.log(response.data);
 
 
-                    // Set the percentage of the habit. percentage received as integer
-                    const percentage = response.data.percentage;
-                    const progressBar = document.getElementById("progress-bar-" + habitId);
-                    progressBar.style.width = percentage + "%";
-                    checkCompletionAndAnimate(habitId, percentage);
+            // Set the percentage of the habit. percentage received as integer
+            const percentage = response.data.percentage;
+            const progressBar = document.getElementById("progress-bar-" + habitId);
+            progressBar.style.width = percentage + "%";
+            checkCompletionAndAnimate(habitId, percentage);
 
-                    const streak = response.data.streak;
-                    const streakSymbol = document.getElementById("streak-" + habitId);
-                    streakSymbol.innerText = streak > 0 ? streak.toString() + " 🔥" : "";
-                }).catch(function (error) {
-                    // Handle the error if needed
-                    console.error('Error:', error);
-                });
+            const streak = response.data.streak;
+            const streakSymbol = document.getElementById("streak-" + habitId);
+            streakSymbol.innerText = streak > 0 ? streak.toString() + " 🔥" : "";
+        }).catch(function (error) {
+            // Handle the error if needed
+            console.error('Error:', error);
+        });
+    }
+
+    function sendHabitId(Id) {
+
+        var habitId = document.getElementById(Id);
+
+        // Make a POST request to /check with the habit id
+        // axios.post('/edit-habit', {editHabitId: habitId})
+    }
+
+    function deleteHabit(habitId) {
+        // Make a POST request to /delete with the habit id
+
+        axios.post('/delete', {habitId: habitId}, {
+            headers: {
+                'Content-Type': 'application/json'
             }
+        }).then(function (response) {
+            // Handle the success response if needed
+            console.log(response.data);
 
-            function sendHabitId(Id) {
-
-                var habitId = document.getElementById(Id);
-
-                // Make a POST request to /check with the habit id
-                // axios.post('/edit-habit', {editHabitId: habitId})
-            }
-
-            function deleteHabit(habitId) {
-                // Make a POST request to /delete with the habit id
-
-                axios.post('/delete', {habitId: habitId}, {
-                    headers: {
-                        'Content-Type': 'application/json'
-                    }
-                }).then(function (response) {
-                    // Handle the success response if needed
-                    console.log(response.data);
-
-                    // Remove the habit from the DOM
-                    var habitElement = document.getElementById("habit-" + habitId);
-                    habitElement.remove();
-                }).catch(function (error) {
-                    // Handle the error if needed
-                    console.error('Error:', error);
-                });
-            }
+            // Remove the habit from the DOM
+            var habitElement = document.getElementById("habit-" + habitId);
+            habitElement.remove();
+        }).catch(function (error) {
+            // Handle the error if needed
+            console.error('Error:', error);
+        });
+    }
 
 
     document.addEventListener('DOMContentLoaded', (event) => {
@@ -106,6 +105,7 @@
         }
     });
 
-
-
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
 </script>
\ No newline at end of file