diff --git a/monstage/static/index.css b/monstage/static/index.css
index 17ad1d6..6b51f11 100644
--- a/monstage/static/index.css
+++ b/monstage/static/index.css
@@ -6,7 +6,7 @@
 
 .entrer a {
 	display:inline-block;
-	background:#4FB088;
+	background:#FFA41E;
 	color:#fff;
 	font-size:1.5em;
 	padding:8px;
@@ -25,6 +25,7 @@
 
 .explications p {
 	color:#fff;
-	padding:10px;
+	padding:20px;
 	font-size:1.1em;
+	text-align:center;
 }
\ No newline at end of file
diff --git a/monstage/static/style.css b/monstage/static/style.css
index 5752861..e59ae20 100644
--- a/monstage/static/style.css
+++ b/monstage/static/style.css
@@ -81,11 +81,18 @@ header .username {
 
 /* formulaires */
 label {
+	display:inline-block;
 	font-weight:bold;
+	padding:10px;
+}
+
+form {
+	overflow:hidden;
 }
 
 form p {
 	padding:10px;
+	overflow:hidden;
 	margin:0;
 }
 
@@ -100,9 +107,8 @@ form p:nth-child(2n+1) {
 form textarea, form input, form select {
 	display:block;
 	font:16px 'Lato', sans-serif;
-	margin-right:0;
-	margin-left:auto;
-	margin-top:10px;
+	margin:10px;
+	float:right;
 }
 
 form textarea {
@@ -116,6 +122,7 @@ form textarea {
 	text-align:right;
 	margin-top:10px;
 	width:100%;
+	clear:both;
 }
 
 /* lieux */
@@ -129,6 +136,7 @@ input#addlieu {
 	padding:15px;
 	width:70%;
 	margin:0 auto;
+	float:none;
 }
 
 div.lieuform {
@@ -213,4 +221,38 @@ div#candidats #addcandidat {
 
 #stage_published p {
 	background:none;
+}
+
+ul.bigger {
+	display:block;
+	padding:0;
+}
+
+ul.bigger li {
+	display:table-row;
+	list-style:none;
+}
+
+ul.bigger li:hover{
+	background:#ccc;
+}
+
+.stagestatus {
+	display:table-cell;
+	width:100px;
+	text-align:right;
+	padding-right:20px;
+}
+
+.stagelink {
+	display:table-cell;
+	padding:10px;
+}
+
+.stagestatus.draft {
+	color:#f00;
+}
+
+.changestage {
+	color:#B8741A;
 }
\ No newline at end of file
diff --git a/monstage/templates/monstage/home.html b/monstage/templates/monstage/home.html
index 0b2391b..da1183a 100644
--- a/monstage/templates/monstage/home.html
+++ b/monstage/templates/monstage/home.html
@@ -4,11 +4,13 @@
   <h1>Bonjour {{ user.first_name }} !</h1>
   <p><a href="{% url 'monstage:profil_edit' %}">Modifier mon profil</a></p>
   <h2>Mes stages</h2>
-  <ul>
+  <ul class="bigger">
   {% for stage in stages %}
-    <li><a href="{% url 'monstage:stage' stage.id %}">{{ stage.sujet }}</a> <span class="published">{{ stage.published|yesno:"(Publié),(Brouillon)" }}</span></li>
+    <li>
+      <span class="stagestatus {{ stage.published|yesno:'published,draft' }}">{{ stage.published|yesno:"Publié,Brouillon" }}</span>
+      <a href="{% url 'monstage:stage' stage.id %}" class="stagelink">{{ stage.sujet }}</a></li>
   {% endfor %}
-    <li><a href="{% url 'monstage:stage_add' %}">Ajouter un stage</a></li>
+    <li><span class="stagestatus">+</span><a href="{% url 'monstage:stage_add' %}" class="stagelink changestage">Ajouter un stage</a></li>
   </ul>
   
 {% endblock %}
diff --git a/monstage/templates/monstage/stage.html b/monstage/templates/monstage/stage.html
index 4a66052..18c5707 100644
--- a/monstage/templates/monstage/stage.html
+++ b/monstage/templates/monstage/stage.html
@@ -43,57 +43,57 @@
   <div id="stage_present">
     <div id="stage_map"></div>
     <div id="stage_misc">
-      {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_desc' stage.id %}">Modifier la description du stage (sujet, ...)</a></p>{% endif %}
-      <p><a href="{% url 'monstage:profil' stage.profil_user.user.username %}">{{ stage.profil_user.user.first_name }} {{ stage.profil_user.user.last_name }}</a> a fait ce stage du {{ stage.start_date }} au {{ stage.end_date }}</p>
+      {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_desc' stage.id %}" class="changestage">Modifier la description du stage (sujet, ...)</a></p>{% endif %}
+      <p><a href="{% url 'monstage:profil' stage.profil_user.user.username %}">{{ stage.profil_user.user.first_name }} {{ stage.profil_user.user.last_name }}</a> a fait ce stage du {{ stage.start_date }} au {{ stage.end_date }}{% if stage.encadrants %}, supervisé par {{ stage.encadrants }}{% endif %}.</p>
       <p>Matières : {% for matiere in stage.matieres.all %}{% if not forloop.first %}, {% endif %}{{ matiere.name }}{% endfor %}</p>
       <p>Thématiques : {% for tag in stage.thematiques.names %}{% if not forloop.first %}, {% endif %}{{ tag }}{% endfor %}</p>
       <p>À {% for lieu in stage.lieux.all %}{% if not forloop.first %}{% if forloop.last %} et {% else %}, {% endif %}{% endif %}{{ lieu.name }} ({{ lieu.ville }}){% endfor %}</p>
-      {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_lieu' stage.id %}">Modifier les lieux du stage</a></p>{% endif %}
+      {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_lieu' stage.id %}" class="changestage">Modifier les lieux du stage</a></p>{% endif %}
     </div>
   </div>
-  {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_feedback' stage.id %}">Modifier les avis sur le stage</a></p>{% endif %}
+  {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_feedback' stage.id %}" class="changestage">Modifier les avis sur le stage</a></p>{% endif %}
   <h2>Ressenti sur le stage</h2>
   {% if stage.avis_encadrants %}
-    <h3>Les encadrants</h3>
-    <p>{{ stage.avis_encadrants }}</p>
+    <h3>Les encadrants : {{ stage.encadrants }}</h3>
+    {{ stage.avis_encadrants|linebreaks }}
   {% endif %}
   {% if stage.avis_equipe %}
     <h3>L'équipe</h3>
-    <p>{{ stage.avis_equipe }}</p>
+    {{ stage.avis_equipe|linebreaks }}
   {% endif %}
   {% if stage.avis_stage %}
     <h3>Le stage en général</h3>
-    <p>{{ stage.avis_stage }}</p>
+    {{ stage.avis_stage|linebreaks }}
   {% endif %}
   {% if stage.avis_admin %}
     <h3>L'administratif et le visa</h3>
-    <p>{{ stage.avis_admin }}</p>
+    {{ stage.avis_admin|linebreaks }}
   {% endif %}
   {% for lieustage in stage.lieustage_set.all %}
   <h2>La vie à {{ lieustage.lieu.ville }}, {{ lieustage.lieu.get_pays_display }}</h2>
   {% if lieustage.avis_global %}
     <h3>Ressenti global du séjour</h3>
-    <p>{{ lieustage.avis_global }}</p>
+    {{ lieustage.avis_global|linebreaks }}
   {% endif %}
   {% if lieustage.avis_lieudevie %}
     <h3>Mon lieu de vie</h3>
-    <p>{{ lieustage.avis_lieudevie }}</p>
+    {{ lieustage.avis_lieudevie|linebreaks }}
   {% endif %}
   {% if lieustage.avis_lieustage %}
     <h3>Le lieu du stage : {{ lieustage.lieu.name }}</h3>
-    <p>{{ lieustage.avis_lieustage }}</p>
+    {{ lieustage.avis_lieustage|linebreaks }}
   {% endif %}
   {% if lieustage.avis_pratique %}
     <h3>S'installer / conseils pratiques</h3>
-    <p>{{ lieustage.avis_pratique }}</p>
+    {{ lieustage.avis_pratique|linebreaks }}
   {% endif %}
   {% if lieustage.avis_visite %}
     <h3>A voir, à faire aux alentours de {{ lieustage.lieu.ville }}</h3>
-    <p>{{ lieustage.avis_visite }}</p>
+    {{ lieustage.avis_visite|linebreaks }}
   {% endif %}
   {% if lieustage.avis_anecdotes %}
     <h3>Anecdotes</h3>
-    <p>{{ lieustage.avis_anecdotes }}</p>
+    {{ lieustage.avis_anecdotes|linebreaks }}
   {% endif %}
   {% endfor %}  
 {% endblock %}
diff --git a/monstage/views.py b/monstage/views.py
index e957eaa..db41e7e 100644
--- a/monstage/views.py
+++ b/monstage/views.py
@@ -16,7 +16,7 @@ def addslashes(s):
     return ''.join(d.get(c, c) for c in s)
 
 def index(request):
-    stats = { 'num_stages': Stage.objects.count() }
+    stats = { 'num_stages': Stage.objects.filter(published=True).count() }
     return render(request, 'monstage/index.html', {'stats': stats})
 
 def forbidden(request, type):