diff --git a/src/events/templates/events/create_team.html b/src/events/templates/events/create_team.html
index 6ca877d..7502624 100644
--- a/src/events/templates/events/create_team.html
+++ b/src/events/templates/events/create_team.html
@@ -11,26 +11,26 @@
             
             <div class="ctf-footer">
                 <div class="col-sm-8 col-md-6 mx-auto">
-                {% if logged == True%}
+                    {% if logged == True%}
                     {% if registered == False %}
                     <span class="message error-msg">{% trans "You need to be registered to the event." %}</span>
                     {% else %}
-                        {% if exist == True %}
-                        <span class="message error-msg">{% trans "Name already taken." %}</span>
-                        {% endif %}
+                    {% if exist == True %}
+                    <span class="message error-msg">{% trans "Name already taken." %}</span>
+                    {% endif %}
                     <h2>Create Team</h2>
                     <form method="post" action="{% url 'events:create_team' event_slug=event.slug %}" class="create-team-form">
-                    {% csrf_token %}
-                    <div class="form-group">
-                        <input class="form-control" type="text" name="teamname" placeholder="{% trans "Team name" %} *" maxlength="150" required="" id="id_teamname"></br>
-                        <input class="form-control" type="password" name="password" placeholder="{% trans "Password" %} *" required="" id="id_password"></br>
-                        <input type="submit" name="" class="form-control" value="{% trans "Create Team" %}">
-                    </div>
+                        {% csrf_token %}
+                        <div class="form-group">
+                            <input class="form-control" type="text" name="teamname" placeholder="{% trans "Team name" %} *" maxlength="150" required="" id="id_teamname"></br>
+                            <input class="form-control" type="password" name="password" placeholder="{% trans "Password" %} *" required="" id="id_password"></br>
+                            <input type="submit" name="" class="form-control" value="{% trans "Create Team" %}">
+                        </div>
                     </form>
                     {% endif %}
-                {% else %}
+                    {% else %}
                     <h4>{% trans "You need to be logged to access this event." %}</h4>
-                {% endif %}
+                    {% endif %}
                 </div>
             </div>
         </div>
@@ -43,19 +43,21 @@
             
         </ul>
         <ul class="list-group">
+            <li class="list-group-item">{% trans "Manage team" %}</li>     
+            <a href="{% url 'events:join_team' event_slug=event.slug %}" class="list-group-item">→{% trans "Join Team" %}</a>     
             <a href="{% url 'events:create_team' event_slug=event.slug %}" class="list-group-item">{% trans "Create Team" %}</a>
-            <a href="{% url 'events:join_team' event_slug=event.slug %}" class="list-group-item">{% trans "Join Team" %}</a>     
-    </ul>
-    {% if event.auto_match %}
-    <ul class="list-group">
-        <form method='GET' action="{% url 'events:find_team' event_slug=event.slug %}">
-          {%csrf_token%}
-          <li class="list-group-item">
-            <input class="form-control" type="submit" value="{% trans "Find me a team !" %}">
-          </li>
-        </form>
-      </ul>
-    {% endif %}
+        </ul>
+        {% if event.auto_match %}
+        <ul class="list-group">
+            <li class="list-group-item">{% trans "No team yet ?" %}</li>     
+            <form method='GET' action="{% url 'events:find_team' event_slug=event.slug %}">
+                {%csrf_token%}
+                <li class="list-group-item">
+                    <input class="form-control" type="submit" value="{% trans "Find me a team !" %}">
+                </li>
+            </form>
+        </ul>
+        {% endif %}
     </div>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/events/templates/events/join_team.html b/src/events/templates/events/join_team.html
index 005ac19..72f4f4f 100644
--- a/src/events/templates/events/join_team.html
+++ b/src/events/templates/events/join_team.html
@@ -11,18 +11,18 @@
             
             <div class="ctf-footer">
                 <div class="col-sm-8 col-md-6 mx-auto">
-                {% if logged == True%}
+                    {% if logged == True%}
                     {% if registered == False %}
                     <span class="message error-msg">{% trans "You need to be registered to the event." %}</span>
                     {% else %}
-                        {% if notexist == True %}
-                        <span class="message error-msg">{% trans "Team does not exist." %}</span>
-                        {% elif wrongpwd == True %}
-                        <span class="message error-msg">{% trans "Wrong password submited." %}</span>
-                        {% elif max == True %}
-                        <span class="message error-msg">{% trans "Maximum size reached." %}</span>
-                        {% elif exist == True %}
-                        {% endif %}
+                    {% if notexist == True %}
+                    <span class="message error-msg">{% trans "Team does not exist." %}</span>
+                    {% elif wrongpwd == True %}
+                    <span class="message error-msg">{% trans "Wrong password submited." %}</span>
+                    {% elif max == True %}
+                    <span class="message error-msg">{% trans "Maximum size reached." %}</span>
+                    {% elif exist == True %}
+                    {% endif %}
                     <h2>Join Team</h2>
                     <form method="post" action="{% url 'events:join_team' event_slug=event.slug %}" class="join-team-form">
                         {% csrf_token %}
@@ -31,11 +31,11 @@
                             <input class="form-control" type="password" name="password" placeholder="{% trans "Password" %} *" required="" id="id_password"></br>
                             <input type="submit" name="" class="form-control" value="{% trans "Join Team" %}">
                         </div>
-                        </form>
+                    </form>
                     {% endif %}
-                {% else %}
+                    {% else %}
                     <h4>{% trans "You need to be logged to access this event." %}</h4>
-                {% endif %}
+                    {% endif %}
                 </div>
             </div>
         </div>
@@ -43,24 +43,26 @@
     <div class="d-none d-md-block col-10 col-md-3 right-sidebar">
         <ul class="list-group">
             <li class="list-group-item">{{ event.name }}</li>
-            <li class="list-group-item">{% trans "Starts at" %} : {{ event.start_date | date:'H:i d-m-y' }}</li>
-            <li class="list-group-item">{% trans "Ends at" %} : {{ event.end_date | date:'H:i d-m-y' }}</li>
+            <li class="list-group-item">{% trans "Starts at" %} : {{ event.start_date | date:'H:i d-m-y'}}</li>
+            <li class="list-group-item">{% trans "Ends at" %} : {{ event.end_date | date:'H:i d-m-y'}}</li>
             
         </ul>
         <ul class="list-group">
-            <a href="{% url 'events:join_team' event_slug=event.slug %}" class="list-group-item">{% trans "Join Team" %}</a>
+            <li class="list-group-item">{% trans "Manage team" %}</li>     
+            <a href="{% url 'events:join_team' event_slug=event.slug %}" class="list-group-item">{% trans "Join Team" %}</a>     
             <a href="{% url 'events:create_team' event_slug=event.slug %}" class="list-group-item">{% trans "Create Team" %}</a>
-    </ul>
-    {% if event.auto_match %}
-    <ul class="list-group">
-        <form method='GET' action="{% url 'events:find_team' event_slug=event.slug %}">
-          {%csrf_token%}
-          <li class="list-group-item">
-            <input class="form-control" type="submit" value="{% trans "Find me a team !" %}">
-          </li>
-        </form>
-      </ul>
-    {% endif %}
+        </ul>
+        {% if event.auto_match %}
+        <ul class="list-group">
+            <li class="list-group-item">{% trans "No team yet ?" %}</li>     
+            <form method='GET' action="{% url 'events:find_team' event_slug=event.slug %}">
+                {%csrf_token%}
+                <li class="list-group-item">
+                    <input class="form-control" type="submit" value="{% trans "Find me a team !" %}">
+                </li>
+            </form>
+        </ul>
+        {% endif %}
     </div>
 </div>
 {% endblock %}
\ No newline at end of file