diff --git a/Controller/EventController.php b/Controller/EventController.php
index 56c2b2d7f..702433e08 100644
--- a/Controller/EventController.php
+++ b/Controller/EventController.php
@@ -41,6 +41,9 @@ class EventController extends Controller
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
+            
+            $this->addFlash('success', $this->get('translator')
+                    ->trans('The event was created'));
 
             return $this->redirect($this->generateUrl('chill_event__event_show', array('event_id' => $entity->getId())));
         }
@@ -186,6 +189,7 @@ class EventController extends Controller
             'method' => 'PUT',
         ));
 
+        $form->remove('center');
 
         $form->add('submit', 'submit', array('label' => 'Update'));
 
@@ -211,6 +215,9 @@ class EventController extends Controller
 
         if ($editForm->isValid()) {
             $em->flush();
+            
+            $this->addFlash('success', $this->get('translator')
+                    ->trans('The event was updated'));
 
             return $this->redirect($this->generateUrl('chill_event__event_edit', array('event_id' => $event_id)));
         }
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index a456de1ee..67e992d7e 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -1,5 +1,6 @@
 #events
 Name: Nom
+Label: Nom
 Date: Date
 Event type : Type d'événement
 See: Voir
@@ -14,6 +15,12 @@ Last update: Dernière mise à jour
 #CRUD event
 Details of an event: Détails d'un événement
 New event: Nouvel événement
+Back to the most recent events: Retour aux derniers événements
+Event creation: Création d'un événement
+Add an event: Ajouter un événement
+Event edit: Modifier un événement
+The event was updated: L'événement a été modifié
+The event was created: L'événement a été créé
 
 #crud participation
 Edit all the participations: Modifier toutes les participations
diff --git a/Resources/views/Event/edit.html.twig b/Resources/views/Event/edit.html.twig
index 1d365f28a..ca326aa80 100644
--- a/Resources/views/Event/edit.html.twig
+++ b/Resources/views/Event/edit.html.twig
@@ -1,16 +1,30 @@
 {% extends 'ChillEventBundle::layout.html.twig' %}
 
+{% block title 'Event edit'|trans %}
+
 {% block event_content -%}
-    <h1>Event edit</h1>
+    <h1>{{ 'Event edit'|trans }}</h1>
 
-    {{ form(edit_form) }}
+    {{ form_start(edit_form) }}
+    {{ form_errors(edit_form) }}
+    {{ form_row(edit_form.circle) }}
+    {% if edit_form.center is defined %}
+    {{ form_row(edit_form.center) }}
+    {% endif %}
+    {{ form_row(edit_form.label) }}
+    {{ form_row(edit_form.date) }}
+    {{ form_row(edit_form.type, { 'label': 'Event type' }) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_event_list_most_recent') }}">
-            Back to the list
-        </a>
-    </li>
-    <li>{{ form(delete_form) }}</li>
-</ul>
+    <ul class="record_actions">
+        <li>
+            <a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
+                {{ 'Back to the most recent events'|trans }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'sc-button bt-update' } }) }}
+        </li>
+    </ul>
+            
+    {{ form_end(edit_form) }}
 {% endblock %}
diff --git a/Resources/views/Event/new.html.twig b/Resources/views/Event/new.html.twig
index fcd90a28b..2986a83ac 100644
--- a/Resources/views/Event/new.html.twig
+++ b/Resources/views/Event/new.html.twig
@@ -1,15 +1,28 @@
 {% extends 'ChillEventBundle::layout.html.twig' %}
 
+{% block title 'Event creation'|trans %}
+
 {% block event_content -%}
-    <h1>Event creation</h1>
+    <h1>{{ 'Event creation'|trans }}</h1>
 
-    {{ form(form) }}
+    {{ form_start(form) }}
+    {{ form_errors(form) }}
+    {{ form_row(form.circle) }}
+    {{ form_row(form.center) }}
+    {{ form_row(form.label) }}
+    {{ form_row(form.date) }}
+    {{ form_row(form.type, { 'label': 'Event type' }) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_event_list_most_recent') }}">
-            Back to the list
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li>
+            <a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
+                {{ 'Back to the most recent events'|trans }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } }) }}
+        </li>
+    </ul>
+            
+    {{ form_end(form) }}
 {% endblock %}
diff --git a/Resources/views/Event/show.html.twig b/Resources/views/Event/show.html.twig
index 12cf2672d..541e08ea1 100644
--- a/Resources/views/Event/show.html.twig
+++ b/Resources/views/Event/show.html.twig
@@ -30,7 +30,7 @@
             
     <ul class="record_actions">
     <li>
-        <a href="{{ path('chill_event__event_edit', { 'id': event.id }) }}" class="sc-button btn-edit">
+        <a href="{{ path('chill_event__event_edit', { 'event_id': event.id }) }}" class="sc-button btn-edit">
             {{ 'Edit'|trans }}
         </a>
     </li>