diff --git a/Controller/ConfigController.php b/Controller/ConfigController.php
index 03aa461..0a2f384 100644
--- a/Controller/ConfigController.php
+++ b/Controller/ConfigController.php
@@ -28,8 +28,8 @@ class ConfigController extends AbstractController
 {
     /**
      * @Route("/settings/{method}")
+     * @Template("@ZikulaOAuthModule/Config/settings.html.twig")
      * @Theme("admin")
-     * @Template("ZikulaOAuthModule:Config:settings.html.twig")
      *
      * @throws AccessDeniedException
      */
diff --git a/Controller/MappingController.php b/Controller/MappingController.php
index af8343f..0dcb755 100644
--- a/Controller/MappingController.php
+++ b/Controller/MappingController.php
@@ -27,7 +27,7 @@ class MappingController extends AbstractController
 {
     /**
      * @Route("/list")
-     * @Template("ZikulaOAuthModule:Mapping:list.html.twig")
+     * @Template("@ZikulaOAuthModule/Mapping/list.html.twig")
      * @Theme("admin")
      *
      * @throws AccessDeniedException
diff --git a/Resources/views/Config/settings.html.twig b/Resources/views/Config/settings.html.twig
index 3e36459..6a4031f 100644
--- a/Resources/views/Config/settings.html.twig
+++ b/Resources/views/Config/settings.html.twig
@@ -1,6 +1,6 @@
 {% form_theme form with [
-'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
-'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
+    '@ZikulaFormExtension/Form/bootstrap_3_zikula_admin_layout.html.twig',
+    '@ZikulaFormExtension/Form/form_div_layout.html.twig'
 ] %}
 {{ polyfill() }}
 {{ adminHeader() }}
diff --git a/Resources/views/Mapping/list.html.twig b/Resources/views/Mapping/list.html.twig
index 4816747..5a6c8a6 100644
--- a/Resources/views/Mapping/list.html.twig
+++ b/Resources/views/Mapping/list.html.twig
@@ -3,12 +3,25 @@
 <h2><i class="fa fa-list"></i>{{ __('Mappings list') }}</h2>
 
 <table class="table table-bordered table-striped">
+    <colgroup>
+        <col id="cMethod" />
+        <col id="cMethodId" />
+        <col id="cZikulaId" />
+    </colgroup>
     <thead>
-    <tr><th>{{ __('Method') }}</th><th>{{ __('MethodId') }}</th><th>{{ __('ZikulaId') }}</th></tr>
+        <tr>
+            <th id="hMethod" scope="col">{{ __('Method') }}</th>
+            <th id="hMethodId" scope="col">{{ __('MethodId') }}</th>
+            <th id="hZikulaId" scope="col">{{ __('ZikulaId') }}</th>
+        </tr>
     </thead>
     <tbody>
         {% for mapping in mappings %}
-            <tr><td>{{ mapping.method }}</td><td>{{ mapping.methodId }}</td><td>{{ mapping.zikulaId }}</td></tr>
+            <tr>
+                <td headers="hMethod">{{ mapping.method }}</td>
+                <td headers="hMethodId">{{ mapping.methodId }}</td>
+                <td headers="hZikulaId">{{ mapping.zikulaId }}</td>
+            </tr>
         {% endfor %}
     </tbody>
 </table>