diff --git a/maraudes/templates/compte_rendu/compterendu_create.html b/maraudes/templates/compte_rendu/compterendu_create.html
index e98e09f..9321710 100644
--- a/maraudes/templates/compte_rendu/compterendu_create.html
+++ b/maraudes/templates/compte_rendu/compterendu_create.html
@@ -42,22 +42,20 @@
     {% csrf_token %}
       <div class="panel panel-primary panel-collapse">
         <div class="panel-heading">
-          <h4>Nouvelle rencontre
-          {% bootstrap_button "Enregistrer" icon="save" button_type="submit" button_class="btn btn-success btn-sm pull-right" %}
-          </h4>
+          <h4 class="panel-title">Nouvelle rencontre</h4>
         </div>
         <div class="panel-body">
           {% include "compte_rendu/compterendu_form.html" %}
         </div>
+        <div class="panel-footer text-right">
+        {% bootstrap_button "Enregistrer" icon="save" button_type="submit" button_class="btn btn-success btn-sm" %}
+        </div>
       </div>
     </form>
   </div>
   <div class="col-md-6 col-sd-12">
     <div class="panel panel-default">
-      <div class="panel-heading"><h4>Enregistrées
-            <a class="btn btn-danger btn-sm pull-right" href="{% url 'maraudes:create' maraude.pk %}?finalize=True">
-            {% bootstrap_icon "ok-circle" %} Finaliser</a></h4>
-      </div>
+      <div class="panel-heading"><h4 class="panel-title">Enregistrées</h4></div>
       <table class="table">
         {% for rencontre in rencontres %}<tr><th colspan="2" class="active">{{ rencontre }}</th></tr>
         {% for observation in rencontre.observations.all %}<tr>
@@ -65,6 +63,10 @@
             <td>{{observation.text}}</td>
         </tr>{% endfor %}{% endfor %}
       </table>
+      <div class="panel-footer text-right">
+        <a class="btn btn-danger btn-sm" href="{% url 'maraudes:create' maraude.pk %}?finalize=True">
+        {% bootstrap_icon "ok-circle" %} Finaliser</a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/suivi/templates/suivi/appel_form.html b/suivi/templates/suivi/appel_form.html
index 3c5c7e6..2795f3a 100644
--- a/suivi/templates/suivi/appel_form.html
+++ b/suivi/templates/suivi/appel_form.html
@@ -1,8 +1,12 @@
 <div class="panel panel-primary">
-    <div class="panel-heading">
-      <h4 class="panel-title">Enregistrer un appel</h4>
+    <div class="panel-heading" role="tab" id="appelHeading">
+      <h4 class="panel-title">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#appelCollapse" aria-expanded="true" aria-controls="collapseOne">
+      Appel</a></h4>
     </div>
-    <div class="panel-body">
-    {% include "suivi/appel_form_inner.html" %}
+    <div id="appelCollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="appelHeading">
+      <div class="panel-body">
+    {% include "suivi/appel_form_inner.html" %}</div>
     </div>
   </div>
+
diff --git a/suivi/templates/suivi/appel_form_inner.html b/suivi/templates/suivi/appel_form_inner.html
index be181fb..aa5d96a 100644
--- a/suivi/templates/suivi/appel_form_inner.html
+++ b/suivi/templates/suivi/appel_form_inner.html
@@ -2,15 +2,15 @@
 {{ form.media.js }}{{ form.media.css }}
 <form action="" method="POST">{% csrf_token %}
   {% with "inline" as layout %}
-  <div class="form-group form-{{layout}} well col-md-10 col-md-offset-2">
+  <div class="form-{{layout}} well col-md-10 col-md-offset-2">
     {% bootstrap_field  form.created_date layout=layout %}
     {% bootstrap_field  form.created_time layout=layout %}
     {% bootstrap_field  form.entrant layout=layout %}
   </div>  {% endwith %}
   {% with "horizontal" as layout %}
-  <div class="form-group form-{{layout}}">
-    {% bootstrap_field  form.sujet layout=layout %}
-    {% bootstrap_field  form.text layout=layout %}
+  <div class="form-{{layout}}">
+    {% bootstrap_field form.sujet layout=layout %}
+    {% bootstrap_field form.text layout=layout %}
   </div>  {% endwith %}
   <div class="pull-right">{% bootstrap_button "Enregistrer l'appel" button_type="submit" %}</div>
 </form>
diff --git a/suivi/templates/suivi/index.html b/suivi/templates/suivi/index.html
index fc9b8b6..d5e32f6 100644
--- a/suivi/templates/suivi/index.html
+++ b/suivi/templates/suivi/index.html
@@ -1,7 +1,8 @@
-<div class="col-md-6">
-  {% include "suivi/signalement_form.html" with form=signalement_form %}
-</div>
-<div class="col-md-6">
-  {% include "suivi/appel_form.html" with form=appel_form %}
+<div class="col-md-6 col-md-offset-6">
+  <h4><strong>Créer une note :</strong></h4>
+  <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+    {% include "suivi/appel_form.html" with form=appel_form %}
+    {% include "suivi/signalement_form.html" with form=signalement_form %}
+  </div>
 </div>
 
diff --git a/suivi/templates/suivi/signalement_form.html b/suivi/templates/suivi/signalement_form.html
index 4a32c65..0b22928 100644
--- a/suivi/templates/suivi/signalement_form.html
+++ b/suivi/templates/suivi/signalement_form.html
@@ -1,8 +1,12 @@
 <div class="panel panel-warning">
-    <div class="panel-heading">
-      <h4 class="panel-title">Signalement</h4>
+    <div class="panel-heading" role="tab" id="signalementHeading">
+      <h4 class="panel-title">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#signalementCollapse" aria-expanded="true" aria-controls="collapseOne">
+      Signalement</a></h4>
     </div>
-    <div class="panel-body">
-    {% include "suivi/signalement_form_inner.html" %}
+    <div id="signalementCollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="signalementHeading">
+      <div class="panel-body">
+        {% include "suivi/signalement_form_inner.html" %}
+      </div>
     </div>
   </div>
diff --git a/suivi/templates/suivi/sujet_suivi.html b/suivi/templates/suivi/sujet_suivi.html
index 0bc40f4..ca9b8c3 100644
--- a/suivi/templates/suivi/sujet_suivi.html
+++ b/suivi/templates/suivi/sujet_suivi.html
@@ -5,7 +5,7 @@
       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseNotesSujet" aria-expanded="true" aria-controls="collapseOne">
       Notes</a><span class="pull-right label">Total : {{ notes.count }}</span></h3>
   </div>
-  <div id="collapseNotesSujet" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="ficheInfoHeading">
+  <div id="collapseNotesSujet" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="notesSujetHeading">
     <table class="table table-striped table-bordered">
         {% for note in notes %}
           {% inline_table note header="date" %}