diff --git a/maraudes/templates/maraudes/index.html b/maraudes/templates/maraudes/index.html
index f739f5a..118eb86 100644
--- a/maraudes/templates/maraudes/index.html
+++ b/maraudes/templates/maraudes/index.html
@@ -26,6 +26,11 @@
           Aucune maraude prévue.
         {% endif %}
         </p>
+        {% if prochaine_maraude.date == date %}
+        <a href="{% url 'maraudes:create' pk=prochaine_maraude.pk %}" class="card-link text-success">
+            <span class="oi oi-pencil" title="Rédiger" aria-hidden="true"></span>
+            <strong>Rédiger le compte-rendu</strong></a>
+        {% endif %}
         <a href="{% url 'maraudes:planning' %}" class="card-link text-primary">
             <span class="oi oi-calendar" title="Calendar" aria-hidden="true"></span> 
             Voir le planning</a>
diff --git a/maraudes/templates/maraudes/planning.html b/maraudes/templates/maraudes/planning.html
index 85bc504..fc1b812 100644
--- a/maraudes/templates/maraudes/planning.html
+++ b/maraudes/templates/maraudes/planning.html
@@ -19,32 +19,27 @@
 
 {% block page_content %}
 <form method="post" action="{% url 'maraudes:planning' %}?month={{month}}&year={{year}}">
-  <input type="submit" id="submit-form" class="hidden" />
+  <input type="submit" id="submit-form" class="invisible" />
   {% csrf_token %}
   {{ formset.management_form }}
-<table class="table table-bordered">
-  <tr class="active">
+<table class="table table-responsive">
+  <tr class="thead-dark">
     {% for weekday in weekdays %}<th>{{weekday}}</th>{% endfor %}
   </tr>
   {% for week in weeks %}
   <tr>
     {% for day, form in week %}
-    <td style="min-width:5%;" {% if form %}class="{% if form.instance.id %}success{%else%}warning{%endif%}"{% endif %}>{% if day %}{% if form %}
-        <div class="row">
-          <div class="col-lg-2">{% endif %}
-            <strong>{{ day }}</strong>
-          {% if form %}</div>
-          <div class="col-lg-10">
+    <td {% if form %}class="table-{% if form.instance.id %}success{%else%}warning{%endif%}"{% endif %}>
+        {% if day %}<strong class="float-left">{{ day }}</strong>
+          {% if form %}
             {% bootstrap_field form.id %}
             {% bootstrap_field form.date %}
-            {% bootstrap_field form.heure_debut layout="inline" size="small" %}
-          </div>
-        </div>
-        <div class="form-horizontal">
-          {% bootstrap_field form.binome layout="horizontal" size="small" show_label=False %}
-          {% bootstrap_field form.referent layout="horizontal" size="small" show_label=False %}
-        </div>
-        {% endif %}
+            <div class="d-flex form-group row pl-3">
+              {% bootstrap_field form.heure_debut size="small" show_label=False %}
+              {% bootstrap_field form.binome size="small" show_label=False %}
+              {% bootstrap_field form.referent size="small" show_label=False %}
+            </div>
+            {% endif %}
       {% endif %}
     </td>
     {% endfor %}