diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 463bc0dd3..4968ebb67 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -18,6 +18,7 @@ Add a new field: Ajouter un champ personnalisé
 ordering: ordre
 label_field: label du champ
 active: actif
+CustomFieldsGroup edit: Edition d'un groupe de champs personnalisé
 
 
 #menu entries
diff --git a/Resources/views/CustomFieldsGroup/edit.html.twig b/Resources/views/CustomFieldsGroup/edit.html.twig
index 3197f9d90..823f492c2 100644
--- a/Resources/views/CustomFieldsGroup/edit.html.twig
+++ b/Resources/views/CustomFieldsGroup/edit.html.twig
@@ -16,17 +16,30 @@
 #}
 {% extends "ChillCustomFieldsBundle::Admin/layout.html.twig" %}
 
-{% block admin_content %}
-    <h1>CustomFieldsGroup edit</h1>
+{% block title %}{{ 'CustomFieldsGroup edit'|trans }}{% endblock %}
 
-    {{ form(edit_form) }}
+{% block admin_content %}
+    <h1>{{ 'CustomFieldsGroup edit'|trans }}</h1>
+
+    {{ form_start(edit_form) }}
+    {{ form_row(edit_form.name) }}
+    {{ form_row(edit_form.entity) }}
+    {% if edit_form.options is defined %}
+    {{ form_row(edit_form.options) }}
+    {% endif %}
+    {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
+    {{ form_end(edit_form) }}
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('customfieldsgroup') }}">
-            Back to the list
+        <a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
+            {{ 'Back to the list'|trans }}
+        </a>
+    </li>
+    <li>
+        <a href="{{ path('customfieldsgroup_show', { 'id' : entity.id }) }}" class="sc-button bt-cancel">
+            {{ 'show'|trans|capitalize }}
         </a>
     </li>
-    <li>{{ form(delete_form) }}</li>
 </ul>
 {% endblock %}