diff --git a/Resources/views/Delete/modal.html.twig b/Resources/views/Delete/modal.html.twig
index 25ee95f..95469c2 100644
--- a/Resources/views/Delete/modal.html.twig
+++ b/Resources/views/Delete/modal.html.twig
@@ -1,8 +1,7 @@
 {% block content %}
 <div class="well well-modal modal-danger">
   {% block form_header %}
-    <form action="{{ app.request.requestUri }}"
-          method="post" class="form-horizontal">
+      {{ form_start(form, {'attr': {'class': 'form-horizontal'} }) }}
   {% endblock form_header %}
   <div class="modal-header">
     <h3>{% block modal_header %}{% endblock modal_header %}</h3>
@@ -13,6 +12,5 @@
   <div class="modal-footer">
     {% block modal_footer %}{% endblock modal_footer %}
   </div>
-  </form>
 </div>
 {% endblock content %}
diff --git a/Resources/views/Form/form.html.twig b/Resources/views/Form/form.html.twig
index c7b06a6..7b78d6e 100644
--- a/Resources/views/Form/form.html.twig
+++ b/Resources/views/Form/form.html.twig
@@ -4,6 +4,10 @@
   {{ form_start(form, {'attr': {'class': 'form-horizontal'} }) }}
 {% endblock form_header %}
 
+{% block form_footer %}
+  {{ form_end(form) }}
+{% endblock form_footer %}
+
 {% block modal_body %}
   {{ form_errors(form) }}
   {{ form_rest(form) }}
diff --git a/Resources/views/Form/modal.html.twig b/Resources/views/Form/modal.html.twig
index 21f7c69..a32f876 100644
--- a/Resources/views/Form/modal.html.twig
+++ b/Resources/views/Form/modal.html.twig
@@ -1,6 +1,6 @@
 {% block content %}
 <div class="col-xs-12">
-  <div class="well well-modal">
+  <div class="well well-modal {% spaceless %}{% block modal_class %}{% endblock modal_class %}{% endspaceless %}">
     {% block form_header %}
     <form action="{{ path('login_check') }}" method="post" class="form-horizontal">
     {% endblock form_header %}
@@ -13,7 +13,9 @@
     <div class="modal-footer">
       {% block modal_footer %}{% endblock modal_footer %}
     </div>
+    {% block form_footer %}
     </form>
+    {% endblock form_footer %}
   </div>
 </div>
 {% endblock content %}
diff --git a/Resources/views/Macros/form.html.twig b/Resources/views/Macros/form.html.twig
index cc85ac0..359b111 100644
--- a/Resources/views/Macros/form.html.twig
+++ b/Resources/views/Macros/form.html.twig
@@ -9,6 +9,6 @@
     {% endif %}
     <a href="{{ path(name ~ '_show', { 'id': value.id }) }}" class="btn btn-default">Cancel</a>
   {% else %}
-    <a href="{{ path(name ~ '_list') }}" class="btn btn-default">Cancel</a>
+    <a href="{{ path(name ~ '_index') }}" class="btn btn-default">Cancel</a>
   {% endif %}
 {% endmacro %}
diff --git a/Resources/views/Macros/show.html.twig b/Resources/views/Macros/show.html.twig
index 99b114e..7a6ccbf 100644
--- a/Resources/views/Macros/show.html.twig
+++ b/Resources/views/Macros/show.html.twig
@@ -144,6 +144,6 @@
 {% if is_granted('ROLE_ADMIN') or is_granted('EDIT',value) %}
   <a href="{{ path(name ~ '_edit', { 'id': value.id }) }}" class="btn btn-primary">Edit</a>
 {% endif %}
-  <a href="{{ path(name ~ '_list') }}" class="btn btn-default">List</a>
+  <a href="{{ path(name ~ '_index') }}" class="btn btn-default">List</a>
 {% endspaceless %}
 {% endmacro %}
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 2c332ae..4ac4f1a 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -179,7 +179,7 @@
       '../bower_components/typeahead.js/dist/bloodhound.js'
       '../bower_components/typeahead.js/dist/typeahead.jquery.js'
       '../bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js'
-      '../bower_components/select2/dist/js/select2.js'
+      '../bower_components/select2/dist/js/select2.full.js'
       '@MopaBootstrapBundle/Resources/public/js/mopabootstrap-collection.js'
       '@BluemesaFormsBundle/Resources/public/js/forms.js'
       '@BluemesaAclBundle/Resources/public/js/forms.js'