diff --git a/templates/group/create_group.twig b/templates/group/create_group.twig
index ace2ba45698302960b160be6c99464c8c9298243..c43e646b88df69d5d57732eafb72c70777273883 100644
--- a/templates/group/create_group.twig
+++ b/templates/group/create_group.twig
@@ -10,9 +10,10 @@
     <div class="field">
         <textarea name="description" id="description" placeholder="Description" value="{{description}}" required></textarea>
     </div>
-    <div class="field">
-        <input type="checkbox" name="private" id="private" value="private"><label for="private"> Private group </label>
-    </div>
+    <div class="ui checkbox">
+        <input type="checkbox" name="private" id="private" value="private">
+        <label for="private">Private Group</label>
+    </input>
     <input type="submit" class="ui submit button">
 </form>
 </div>
diff --git a/templates/group/list_groups.twig b/templates/group/list_groups.twig
index 3e53cafecfb404b37998834fb733f78f3c9f3ed7..deb0a84b38dbdf3a1b599805d2a794b50d570588 100644
--- a/templates/group/list_groups.twig
+++ b/templates/group/list_groups.twig
@@ -2,11 +2,13 @@
 {% block content %}
     <div style="grid-column:1/2; grid-row:1/2">
         <h1> List groups </h1>
+        {% if session.userId %}
         <form action="/groups/create">
             <button type="submit" class="ui button">Create a group</button>
         </form>
+        {% endif %}
     </div>
-    <div class="ui relaxed divided list" id="list" style="max-height:590px;">
+    <div class="ui relaxed divided list" id="list" style="max-height:585px;">
     {% for group in groups %}
         <a href="groups/{{group.id}}" class="item">
             <div class="ui horizontal label">