diff --git a/website/db.sqlite3 b/website/db.sqlite3
index ffc03ce57c7a4ee37ce742d6e4f1dd55f0d43e04..e7c22aaee9632f18203b0095fa39414df0f19d56 100644
Binary files a/website/db.sqlite3 and b/website/db.sqlite3 differ
diff --git a/website/nutriform/migrations/0014_auto_20191211_1752.py b/website/nutriform/migrations/0014_auto_20191211_1752.py
new file mode 100644
index 0000000000000000000000000000000000000000..fa60498ea399d46e8f8cc02ee8556a593ead478e
--- /dev/null
+++ b/website/nutriform/migrations/0014_auto_20191211_1752.py
@@ -0,0 +1,45 @@
+# Generated by Django 2.2.6 on 2019-12-11 16:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nutriform', '0013_auto_20191206_1522'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sport',
+            name='intensite',
+        ),
+        migrations.RemoveField(
+            model_name='sport',
+            name='nb_seances',
+        ),
+        migrations.RemoveField(
+            model_name='sport',
+            name='type_sport',
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='activite',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='geoPoint',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='lieu',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='salle',
+            field=models.CharField(max_length=100, null=True),
+        ),
+    ]
diff --git a/website/nutriform/models.py b/website/nutriform/models.py
index 803d389d30ee4f5031463bec9fe99f88c612bdbc..3b301c7d227c374765a58595f2d07b2e007eff12 100644
--- a/website/nutriform/models.py
+++ b/website/nutriform/models.py
@@ -39,9 +39,10 @@ class Menu(models.Model):
         return self.type_menu
 
 class Sport(models.Model):
-    type_sport = models.CharField(max_length=150)
-    nb_seances = models.IntegerField()
-    intensite = models.IntegerField()
+    salle = models.CharField(max_length=100, null=True)
+    activite = models.CharField(max_length=100, null=True)
+    lieu = models.CharField(max_length=100, null=True)
+    geoPoint = models.CharField(max_length=100, null=True)
 
 MALADIES_CHOICES = [
     ('RH', 'Rhume'),
diff --git a/website/nutriform/templates/nutriform/add_annonce.html b/website/nutriform/templates/nutriform/add_annonce.html
index 8b0e975ebe4e268885b6e5bd5a173be6ecfa594a..ef2940c4fab296fbe426a11cde8ffa075b10f2db 100644
--- a/website/nutriform/templates/nutriform/add_annonce.html
+++ b/website/nutriform/templates/nutriform/add_annonce.html
@@ -12,7 +12,7 @@
         {% csrf_token %}
 
         {{ form }}
-
+        <br>
         <input type="submit" value="Créer">
     </form>
 </div class="container">
diff --git a/website/nutriform/templates/nutriform/annonces.html b/website/nutriform/templates/nutriform/annonces.html
index 588811dc91a49ea67526ae87ef2052fef8cef770..3b1eaf5c1eadf22f9e7ce18f36fdd4c09de5228f 100644
--- a/website/nutriform/templates/nutriform/annonces.html
+++ b/website/nutriform/templates/nutriform/annonces.html
@@ -8,9 +8,22 @@
         <h2>Participez à des activités sportives communautaires</h2>
     </header>
   
+    <div class="row uniform center">
     {% for annonce in annonces_list %}
-    <a href="{% url 'detail_annonce' annonce.id %}">{{ annonce.get_type_annonce_display }} - {{ annonce.sport }} - {{ annonce.orga.username }}</a>
+    <div class="6u 12u$(xsmall)">
+        <ul style="list-style: none;">
+            <li>{{ annonce.get_type_annonce_display }}</li>
+            <li><i>{{ annonce.date }}</i></li>
+            <li>{{ annonce.sport }}</li>
+            <li>{{ annonce.ville }}</li>
+            <li>{{ annonce.description }}</li>
+        </ul>
+        {% if user.is_authenticated and user != annonce.orga %}
+        <a href="mailto:{{annonce.orga.email}}" class="button">Contacter l'organisateur</a>
+        {% endif %}
+    </div>
     {% endfor %}
+    </div>
     <br>
     <a href="{% url 'add_annonce' %}" class="button">Créer mon annonce</a>
 </div class="container">
diff --git a/website/nutriform/templates/nutriform/base.html b/website/nutriform/templates/nutriform/base.html
index 56cec4b97de341f975fd8adf21942d046fb32cf3..13929d747a63f9af45e9ca75ed682e12d09e603b 100644
--- a/website/nutriform/templates/nutriform/base.html
+++ b/website/nutriform/templates/nutriform/base.html
@@ -54,6 +54,7 @@
 				<li>&copy; NutriForm</li>
 				<li>Design: <a href="http://templated.co">TEMPLATED</a></li>
 				<li>Images: <a href="http://unsplash.com">Unsplash</a></li>
+				<li><a href="{% url 'cgu' %}">Conditions générales d'utlisation</a></li>
 			</ul>
 		</div>
 	</footer>
diff --git a/website/nutriform/templates/nutriform/cgu.html b/website/nutriform/templates/nutriform/cgu.html
new file mode 100644
index 0000000000000000000000000000000000000000..4f1076452467c768b79aa65e1ea228d04d645070
--- /dev/null
+++ b/website/nutriform/templates/nutriform/cgu.html
@@ -0,0 +1,13 @@
+{% extends "../nutriform/base.html" %}
+
+{% block content %}
+
+<div class="container">
+
+    <header class="major">
+        <h2>Conditions générales d'utilisation</h2>
+    </header>
+    
+    
+</div class="container">
+{% endblock %}
\ No newline at end of file
diff --git a/website/nutriform/templates/nutriform/index.html b/website/nutriform/templates/nutriform/index.html
index dc3c2b39fb46294056ff4882112c53c65e191dbb..b09c833bdd87d994403dc9a306ee6f83b08323b8 100644
--- a/website/nutriform/templates/nutriform/index.html
+++ b/website/nutriform/templates/nutriform/index.html
@@ -221,6 +221,7 @@
 				<li>&copy; NutriForm</li>
 				<li>Design: <a href="http://templated.co">NutriForm_Design</a></li>
 				<li>Images: <a href="http://unsplash.com">Unsplash</a></li>
+				<li><a href="{% url 'cgu' %}">Conditions générales d'utilisation</a></li>
 			</ul>
 		</div>
 	</footer>
diff --git a/website/nutriform/urls.py b/website/nutriform/urls.py
index f8d9963c96aa629765d1396ebe6fa4157bd901c0..365eae8d741d3ab99831c5db69c2099c280f0caf 100644
--- a/website/nutriform/urls.py
+++ b/website/nutriform/urls.py
@@ -16,5 +16,6 @@ urlpatterns = [
 	path('accounts/profile/modification_infos/', views.modif_infos, name='modif_info'),
 	path('annonces/créer/', views.addAnnnonce, name='add_annonce'),
 	path('annonces/<int:annonce_id>/', views.detail_annonce, name='detail_annonce'),
-	path('annonces/', views.annonces, name='annonces')
+	path('annonces/', views.annonces, name='annonces'),
+	path('cgu/', views.cgu, name='cgu')
 ]
diff --git a/website/nutriform/views.py b/website/nutriform/views.py
index ea6e36e05262a794c431f398f2cdfa18c9637e41..4fd7c91bda6cfeda79d374daf3582fbde27b1c29 100644
--- a/website/nutriform/views.py
+++ b/website/nutriform/views.py
@@ -205,7 +205,7 @@ def addAnnnonce(request):
 			annonce = form.save()
 			annonce.orga = request.user
 			annonce.save()
-			return redirect('compte')
+			return redirect('annonces')
 
 	else :
 		form = AnnonceForm()
@@ -213,4 +213,7 @@ def addAnnnonce(request):
 	context = {
 		'form':form,
 	}
-	return render(request, 'nutriform/add_annonce.html', context)
\ No newline at end of file
+	return render(request, 'nutriform/add_annonce.html', context)
+
+def cgu(request):
+	return render(request, 'nutriform/cgu.html')
\ No newline at end of file