diff --git a/aula/Group/routes.py b/aula/Group/routes.py
index d15afc2..a5b6104 100644
--- a/aula/Group/routes.py
+++ b/aula/Group/routes.py
@@ -34,4 +34,20 @@ def create():
         flash('Gruppen blev oprettet', 'success')
     else:
         flash('En gruppe med det navn findes allerede', 'danger')
+    return redirect(f"/groups")
+
+@Group.route("/groups/join/<int:group_id>", methods=['GET'])
+def join(group_id):
+    group = get_group(group_id)
+
+    current_user.join_group(group_id)
+    flash(f'Du er nu tilmeldt {group.name} gruppen', 'success')
+    return redirect(f"/groups")
+
+@Group.route("/groups/leave/<int:group_id>", methods=['GET'])
+def leave(group_id):
+    group = get_group(group_id)
+
+    current_user.leave_group(group_id)
+    flash(f'Du er frameldt {group.name} gruppen', 'success')
     return redirect(f"/groups")
\ No newline at end of file
diff --git a/aula/templates/groups.html b/aula/templates/groups.html
index 4e3575b..1b14a37 100644
--- a/aula/templates/groups.html
+++ b/aula/templates/groups.html
@@ -8,7 +8,20 @@
         {% for group in groups %}
         <div class="card">
             <div class="card-body">
-                <p><a class="group-name" href="{{ url_for('Group.show', group_id = group.group_id) }}">{{ group.name }}</a></p>
+                <p>
+                    <a class="group-name" href="{{ url_for('Group.show', group_id = group.group_id) }}">{{ group.name }}</a>
+                    {% if not group.mandatory %}
+                        {% if current_user.is_member_of_group(group.group_id) %}
+                            <a class="btn btn-danger btn-sm float-right" href="{{ url_for('Group.leave', group_id = group.group_id) }}">Afmeld</a>
+                        {% else %}
+                            <a class="btn btn-success btn-sm float-right" href="{{ url_for('Group.join', group_id = group.group_id) }}">Tilmeld</a>
+                        {% endif %}
+
+                    {% else %}
+                        <a class="btn btn-secondary btn-sm float-right" href="#" disabled>Obligatorisk</a>
+                    {% endif %}
+                </p>
+                
             </div>
           </div>
         {% endfor %}
diff --git a/aula/templates/home.html b/aula/templates/home.html
index 5ac1a68..e334d0b 100644
--- a/aula/templates/home.html
+++ b/aula/templates/home.html
@@ -13,7 +13,7 @@
             </div>
             <h2><a class="article-title" href="#">{{ post.title }}</a></h2>
             <p class="article-content">{{ post.content }}</p>
-            <a class="group-name" href="{{ url_for('Group.show', group_id = post.group.group_id) }}"">
+            <a class="group-name" href="{{ url_for('Group.show', group_id = post.group.group_id) }}">
               {{ post.group.name }}
             </a>
           </div>