diff --git a/aula/Group/routes.py b/aula/Group/routes.py
index 7646b2f..ed9394e 100644
--- a/aula/Group/routes.py
+++ b/aula/Group/routes.py
@@ -47,7 +47,7 @@ def join(group_id):
 
     current_user.join_group(group_id)
     flash(f'Du er nu tilmeldt {group.name} gruppen', 'success')
-    return redirect(f"/groups")
+    return redirect(f"/groups/{group_id}")
 
 @Group.route("/groups/leave/<int:group_id>", methods=['GET'])
 def leave(group_id):
diff --git a/aula/templates/group_show.html b/aula/templates/group_show.html
index 1878c05..9537fac 100644
--- a/aula/templates/group_show.html
+++ b/aula/templates/group_show.html
@@ -1,6 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
-    <h1>{{ group.name }}</h1>
+    <h1>{{ group.name }}   
+    </h1>
     <hr>
     {% if posts|length == 0 %}
       <p>Gruppen har ingen opslag endnu</p>
@@ -17,6 +18,8 @@
           </div>
         </article>
     {% endfor %}
+
+    {% if current_user.is_member_of_group(group.group_id) %}
     <div class="card">
       <div class="card-body">
         <p style="font-weight: bold;">Skriv opslag</p>
@@ -31,20 +34,41 @@
         </form>
       </div>
     </div>
+    {% endif %}
 {% endblock content %}
 
 {% block sidebar %}
+  {% if current_user.is_member_of_group(group.group_id) %}
   <p style="font-weight: bold;">Gruppe tråde</p>
-  {% if threads|length == 0 %}
-      <p>Gruppen har ingen tråde endnu</p>
+    {% if threads|length == 0 %}
+        <p>Gruppen har ingen tråde endnu</p>
+    {% endif %}
+    {% for thread in threads %}
+      <p><a href="{{ url_for('Threads.show', thread_id = thread.thread_id) }}">{{ thread.title }}</a></p>
+    {% endfor %}
+    <hr>
+    <form method="POST" action="{{ url_for('Threads.create')}}">
+    {{ form.group_id(value=group.group_id) }}
+    <p>{{ form.title(class="form-control", placeholder="Trådens title") }}</p>
+    <p>{{ form.submit(class="btn btn-primary btn-block", value="Start tråd") }}</p>
+    </form>
+
+  {% else %}
+
+    <p>Tilmeld dig gruppe for at se gruppe tråde og skrive opslag</p>
+    <p><a class="btn btn-success btn-sm btn-block" href="{{ url_for('Group.join', group_id = group.group_id) }}">Tilmeld</a></p>
+
   {% endif %}
-  {% for thread in threads %}
-    <p><a href="{{ url_for('Threads.show', thread_id = thread.thread_id) }}">{{ thread.title }}</a></p>
-  {% endfor %}
+
+  {% if current_user.is_member_of_group(group.group_id) %}
+  <p>
   <hr>
-  <form method="POST" action="{{ url_for('Threads.create')}}">
-  {{ form.group_id(value=group.group_id) }}
-  <p>{{ form.title(class="form-control", placeholder="Trådens title") }}</p>
-  <p>{{ form.submit(class="btn btn-primary btn-block", value="Start tråd") }}</p>
-  </form>
+    {% if group.mandatory %}
+      <a class="btn btn-secondary btn-sm disabled" href="#">Obligatorisk gruppe</a>
+    {% else %}  
+      <a class="btn btn-danger btn-sm btn-block" href="{{ url_for('Group.leave', group_id = group.group_id) }}">Forlad gruppen</a>
+    {% endif %}  
+  </p> 
+  {% endif %}   
+
 {% endblock sidebar %}
diff --git a/aula/templates/thread_show.html b/aula/templates/thread_show.html
index 33058c4..0fc42b5 100644
--- a/aula/templates/thread_show.html
+++ b/aula/templates/thread_show.html
@@ -30,3 +30,8 @@
     </script>
   </div>
 {% endblock content %}
+
+{% block sidebar %}
+<a class="group-name" href="{{ url_for('Group.show', group_id = thread.group_id) }}">{{thread.group.name}}</a>
+
+{% endblock sidebar %}
diff --git a/aula/templates/threads.html b/aula/templates/threads.html
index ccc6415..8716f89 100644
--- a/aula/templates/threads.html
+++ b/aula/templates/threads.html
@@ -5,6 +5,7 @@
     {% for thread in threads %}
         <div class="content-section">
             <a class="thread-name" href="{{ url_for('Threads.show', thread_id = thread.thread_id) }}"">{{thread.title}}</a>
+            <a class="float-right group-name" href="{{ url_for('Group.show', group_id = thread.group_id) }}">{{thread.group.name}}</a>
         </div>
     {% endfor %}
 {% endblock content %}