diff --git a/maraudes/notes.py b/maraudes/notes.py
index 573d3ce..2922eb4 100644
--- a/maraudes/notes.py
+++ b/maraudes/notes.py
@@ -20,6 +20,7 @@ class Observation(Note):
     def __str__(self):
         return "%s" % self.sujet
 
+
     def note_date(self):
         """ Enforce value of created_date """
         return self.rencontre.date
diff --git a/maraudes/templates/maraudes/panel_dernieres_maraudes.html b/maraudes/templates/maraudes/panel_dernieres_maraudes.html
index fa62a11..1aca518 100644
--- a/maraudes/templates/maraudes/panel_dernieres_maraudes.html
+++ b/maraudes/templates/maraudes/panel_dernieres_maraudes.html
@@ -6,9 +6,9 @@
     <span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
   </div>
   <div class="list-group">
-    {% for maraude in dernieres_maraudes %}
-    <a href="{% url 'maraudes:details' maraude.pk %}" class="list-group-item">
-      <strong>{{ maraude }}</strong> <small>{{maraude.binome}} & {{maraude.referent}}</small>
+    {% for m in dernieres_maraudes %}
+    <a href="{% url 'maraudes:details' m.pk %}" class="list-group-item {% if maraude == m %} active{% endif %}">
+      <strong>{{ m }}</strong> <small>{{m.binome}} & {{m.referent}}</small>
     </a>
     {% endfor %}
   </div>
diff --git a/maraudes/views.py b/maraudes/views.py
index 44442e7..24fbf65 100644
--- a/maraudes/views.py
+++ b/maraudes/views.py
@@ -93,7 +93,10 @@ class MaraudeListView(MaraudesView, generic.ListView):
 class CompteRenduCreateView(MaraudesView, generic.DetailView):
     model = Maraude
     template_name = "compte_rendu/compterendu_create.html"
+    context_object_name = "maraude"
 
+    header = "Compte-rendu"
+    header_small = "maraude"
     form = None
     inline_formset = None
 
diff --git a/notes/models.py b/notes/models.py
index 1bfc61c..d9bcb25 100644
--- a/notes/models.py
+++ b/notes/models.py
@@ -32,14 +32,17 @@ class Note(models.Model):
     created_time = models.TimeField('Heure', blank=True, null=True)
 
     def save(self, *args, **kwargs):
-        child_instance = self.cast()
-        self.created_date = child_instance.note_date()
-        self.created_time = child_instance.note_time()
+        if not self.created_date or not self.created_time:
+            child_instance = self.cast()
+            self.created_date = child_instance.note_date()
+            self.created_time = child_instance.note_time()
         return super().save(*args, **kwargs)
 
     def _get_child_class_and_instance(self):
         self._child_instance = self
         self._child_class = self.__class__
+        if self._meta.get_parent_list(): # If self is actually child instance
+            return
         for f in self._meta.get_fields():
             if f.is_relation and f.one_to_one:
                 self._child_instance = getattr(self, f.name)
diff --git a/sujets/templates/sujets/sujet_details_inner.html b/sujets/templates/sujets/sujet_details_inner.html
index 63ee2ad..4e73811 100644
--- a/sujets/templates/sujets/sujet_details_inner.html
+++ b/sujets/templates/sujets/sujet_details_inner.html
@@ -16,7 +16,7 @@
     <tr><td colspan="2">{{ sujet.parcours_de_vie }}</td><th>Lien familial</th><td>{{ sujet.lien_familial }}</td></tr>
   </table>
   <div class="panel-footer text-right">
-    <a href="{% url "sujets:update" pk=sujet.id %}" class="btn btn-primary">Mettre à jour</a>
+    <a href="{% url "sujets:update" pk=sujet.id %}" class="btn btn-sm btn-default">Mettre à jour</a>
   </div>
 </div>