diff --git a/lib/GaletteAuto/Filters/ModelsList.php b/lib/GaletteAuto/Filters/ModelsList.php
index 73da0970..8ddcce7c 100644
--- a/lib/GaletteAuto/Filters/ModelsList.php
+++ b/lib/GaletteAuto/Filters/ModelsList.php
@@ -25,11 +25,9 @@ class ModelsList extends Pagination
 
     /**
      * Returns the field we want to default set order to
-     *
-     * @return string field name
      */
-    protected function getDefaultOrder(): string
+    protected function getDefaultOrder(): int
     {
-        return 'model';
+        return self::ORDERBY_MODEL;
     }
 }
diff --git a/templates/default/history.html.twig b/templates/default/history.html.twig
index acf5270d..299b1d5d 100644
--- a/templates/default/history.html.twig
+++ b/templates/default/history.html.twig
@@ -41,7 +41,7 @@
                         {%  elseif owner.isWoman() %}
                             <i class="ui female icon tooltip"><span class="visually-hidden">{{ _T('Is a woman') }}</span></i>
                         {% else %}
-                            <i class="ui icon"></i>
+                            <i class="ui icon" aria-hidden="true"></i>
                         {% endif %}
                         {{ owner.sfullname }}
                     </td>
diff --git a/templates/default/history_modal.js.twig b/templates/default/history_modal.js.twig
new file mode 100644
index 00000000..929462c4
--- /dev/null
+++ b/templates/default/history_modal.js.twig
@@ -0,0 +1,34 @@
+{#
+ # This file is part of Galette Auto plugin (https://galette.eu).
+ # SPDX-FileCopyrightText: Copyright © 2009-2026 The Galette Team
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ #}
+
+{# Open vehicle history in a modal from any `.vehicle-history` button #}
+    $(function() {
+        $('.vehicle-history').on('click', function() {
+            $.ajax({
+                url: $(this).data('url'),
+                success: function(res) {
+                    {% include "elements/js/modal.js.twig" with {
+                        modal_title_twig: _T("Car's history", "auto")|e("js"),
+                        modal_content: "res",
+                        modal_class: "large",
+                        modal_content_class: "scrolling",
+                        modal_deny_only: true,
+                        modal_cancel_text: _T("Close")|e("js")
+                    } %}
+                },
+                error: function() {
+                    {% include "elements/js/modal.js.twig" with {
+                        modal_title_twig: _T("An error occurred displaying history :(", "auto")|e("js"),
+                        modal_without_content: true,
+                        modal_class: "mini",
+                        modal_deny_only: true,
+                        modal_cancel_text: _T("Close")|e("js"),
+                        modal_classname: "redalert",
+                    } %}
+                }
+            });
+        });
+    });
diff --git a/templates/default/model.html.twig b/templates/default/model.html.twig
index f94ea01e..193ffc33 100644
--- a/templates/default/model.html.twig
+++ b/templates/default/model.html.twig
@@ -10,7 +10,7 @@
     <form class="ui form" action="{% if mode == "new" %}{{ url_for("doModelAdd") }}{% else %}{{ url_for("doModelEdit", {"id": model.id}) }}{% endif %}" method="post" id="modifform">
         <div class="ui styled fluid accordion field">
             <div class="active title">
-                <i class="icon dropdown"></i>
+                <i class="icon dropdown" aria-hidden="true"></i>
                 {{ page_title }}
             </div>
             <div class="active content">
@@ -45,7 +45,7 @@
 
         <div class="ui basic center aligned fitted segment">
             <button type="submit" name="valid" class="action ui labeled icon primary button">
-                <i class="save icon"></i> {{ _T("Save") }}
+                <i class="save icon" aria-hidden="true"></i> {{ _T("Save") }}
             </button>
             <input type="hidden" name="{{ mode }}" value="1"/>
             {% if mode != "new" %}
diff --git a/templates/default/models_list.html.twig b/templates/default/models_list.html.twig
index fddfa732..fa2c7b10 100644
--- a/templates/default/models_list.html.twig
+++ b/templates/default/models_list.html.twig
@@ -5,9 +5,24 @@
  #}
 
 {% extends 'elements/list.html.twig' %}
+{% import "macros.twig" as macros %}
 
 {% set nb = count_models %}
 
+{% set form = {
+    'route': {
+        'name': 'modelsFilter'
+    },
+    'order': {
+        'name': 'modelsList'
+    }
+} %}
+
+{% set columns = [
+    {'label': _T("Model", "auto"), 'order': constant('GaletteAuto\\Filters\\ModelsList::ORDERBY_MODEL')},
+    {'label': _T("Brand", "auto"), 'order': constant('GaletteAuto\\Filters\\ModelsList::ORDERBY_BRAND')}
+] %}
+
 {% block infoline %}
     {% set infoline = {
         'label': _Tn("%count model", "%count models", count_models, "auto")|replace({"%count": count_models}),
@@ -28,14 +43,6 @@
     </a>
 {% endblock %}
 
-{% block header %}
-    {% set columns = [
-        {'label': _T("Model", "auto")},
-        {'label': _T("Brand", "auto")}
-    ] %}
-    {{ parent() }}
-{% endblock %}
-
 {% block body %}
     {% for m in models %}
         {% set edit_link = url_for("modelEdit", {"id": m.id}) %}
@@ -43,20 +50,12 @@
         <td data-col-label="{{ _T("Model", "auto") }}"><a href="{{ edit_link }}">{{ m.model }}</a></td>
         <td data-col-label="{{ _T("Brand", "auto") }}"><a href="{{ edit_link }}">{{ m.brand.getValue() }}</a></td>
         <td class="center actions_row collapsing">
-            <a href="{{ edit_link }}" class="tooltip action">
-                <i class="ui edit icon"></i>
-                <span class="visually-hidden">{{ _T("Edit %property", "auto")|replace({"%property": m.brand.getValue() ~ ' ' ~ m.model}) }}</span>
-            </a>
-            <a
-                class="delete tooltip"
-                href="{{ url_for("removeModel", {"id": m.id}) }}"
-            >
-                <i class="ui red trash icon"></i>
-                <span class="visually-hidden">{{ _T("%property: remove from database", "auto")|replace({"%property": m.brand.getValue() ~ ' ' ~ m.model}) }}</span>
-            </a>
+            {% set label = m.brand.getValue() ~ ' ' ~ m.model %}
+            {{ macros.drawListAction(_T("Edit %property", "auto")|replace({"%property": label}), {'name': 'modelEdit', 'args': {'id': m.id}}, 'edit') }}
+            {{ macros.drawListAction(_T("%property: remove from database", "auto")|replace({"%property": label}), {'name': 'removeModel', 'args': {'id': m.id}}, 'red trash', 'delete') }}
         </td>
     </tr>
     {% else %}
-        <tr><td colspan="4" class="emptylist">{{ _T("no record found", "auto") }}</td></tr>
+        <tr><td colspan="{{ columns_count }}" class="emptylist">{{ _T("no record found", "auto") }}</td></tr>
     {% endfor %}
 {% endblock %}
diff --git a/templates/default/object.html.twig b/templates/default/object.html.twig
index 5a4a107e..e5f06017 100644
--- a/templates/default/object.html.twig
+++ b/templates/default/object.html.twig
@@ -13,7 +13,7 @@
     <form class="ui form" action="{% if mode == "new" %}{{ url_for("doPropertyAdd", {"property": set}) }}{% else %}{{ url_for("doPropertyEdit", {"property": set, "id": obj.getId()}) }}{% endif %}" method="post" id="modifform">
         <div class="ui styled fluid accordion field">
             <div class="active title">
-                <i class="icon dropdown"></i>
+                <i class="icon dropdown" aria-hidden="true"></i>
                 {{ page_title }}
             </div>
             <div class="active content">
@@ -30,7 +30,7 @@
 
         <div class="ui basic center aligned fitted segment">
             <button type="submit" name="valid" class="action ui labeled icon primary button">
-                <i class="save icon"></i> {{ _T("Save") }}
+                <i class="save icon" aria-hidden="true"></i> {{ _T("Save") }}
             </button>
             <input type="hidden" name="set" value="{{ set }}"/>
             <input type="hidden" name="{{ mode }}" value="1"/>
diff --git a/templates/default/object_list.html.twig b/templates/default/object_list.html.twig
index 8b15a77e..329dd8ef 100644
--- a/templates/default/object_list.html.twig
+++ b/templates/default/object_list.html.twig
@@ -5,11 +5,16 @@
  #}
 
 {% extends 'elements/list.html.twig' %}
+{% import "macros.twig" as macros %}
 
 {% set field = obj.getField() %}
 
 {% set nb = list|length %}
 
+{% set columns = [
+    {'label': field_name}
+] %}
+
 {% block infoline %}
     {% set infoline = {
         'label': count_label,
@@ -31,13 +36,6 @@
     </a>
 {% endblock %}
 
-{% block header %}
-    {% set columns = [
-        {'label': field_name}
-    ] %}
-    {{ parent() }}
-{% endblock %}
-
 {% block body %}
     {% for o in list %}
         {% set edit_link = url_for("propertyEdit", {"property": obj.getRouteName(), "id": o.getId()}) %}
@@ -50,20 +48,11 @@
             </a>
         </td>
         <td class="center actions_row collapsing">
-            <a href="{{ edit_link }}" class="tooltip action">
-                <i class="ui edit icon"></i>
-                <span class="visually-hidden">{{ _T("Edit %property", "auto")|replace({"%property": o.getValue()}) }}</span>
-            </a>
-            <a
-                class="delete tooltip"
-                href="{{ url_for("removeProperty", {"property": obj.getRouteName(), "id": o.getId()}) }}"
-            >
-                <i class="ui red trash icon"></i>
-                <span class="visually-hidden">{{ _T("%property: remove from database", "auto")|replace({"%property": o.getValue()}) }}</span>
-            </a>
+            {{ macros.drawListAction(_T("Edit %property", "auto")|replace({"%property": o.getValue()}), {'name': 'propertyEdit', 'args': {'property': obj.getRouteName(), 'id': o.getId()}}, 'edit') }}
+            {{ macros.drawListAction(_T("%property: remove from database", "auto")|replace({"%property": o.getValue()}), {'name': 'removeProperty', 'args': {'property': obj.getRouteName(), 'id': o.getId()}}, 'red trash', 'delete') }}
         </td>
     </tr>
     {% else %}
-        <tr><td colspan="3" class="emptylist">{{ _T("no record found", "auto") }}</td></tr>
+        <tr><td colspan="{{ columns_count }}" class="emptylist">{{ _T("no record found", "auto") }}</td></tr>
     {% endfor %}
 {% endblock %}
diff --git a/templates/default/object_show.html.twig b/templates/default/object_show.html.twig
index 3f2e8d8e..99858c97 100644
--- a/templates/default/object_show.html.twig
+++ b/templates/default/object_show.html.twig
@@ -24,18 +24,17 @@
                 {{ _T("Registered models for the brand '%s'", "auto")|replace({'%s': obj.getValue()}) }}
             </div>
         </h2>
-        <div class="ui relaxed divided list">
+        <ul class="ui relaxed divided list">
             {% for model in models %}
-                <div class="item">
+                <li class="item">
                     <div class="content">
                         <div class="header">
-                            <a href="{{ url_for("modelEdit", {"action": "edit", "id": model.id}) }}">{{ model.model }}</a>
+                            <a href="{{ url_for("modelEdit", {"id": model.id}) }}">{{ model.model }}</a>
                         </div>
                     </div>
-                </div>
-                <li></li>
+                </li>
             {% endfor %}
-        </div>
+        </ul>
     {% else %}
         <div class="ui info message">
             <p>{{ _T("The brand '%s' does not have any registered model at this time.", "auto")|replace({'%s': obj.getValue()}) }}</p>
diff --git a/templates/default/public_vehicles_list.html.twig b/templates/default/public_vehicles_list.html.twig
index e2db6643..e9187c55 100644
--- a/templates/default/public_vehicles_list.html.twig
+++ b/templates/default/public_vehicles_list.html.twig
@@ -8,6 +8,16 @@
 
 {% set nb = autos|length %}
 {% set is_public = not login.isLogged() %}
+{% set no_action = true %}
+
+{% set columns = [
+    {'label': _T("Picture"), 'collapse': true},
+    {'label': _T("Name", "auto")},
+    {'label': _T("Owner", "auto")},
+    {'label': _T("Brand", "auto")},
+    {'label': _T("Model", "auto")},
+    {'label': _T("Description", "auto")},
+] %}
 
 {% set form = {
     'route': {
@@ -22,19 +32,6 @@
     {{ parent() }}
 {% endblock %}
 
-{% block header %}
-    {% set no_action = true %}
-    {% set columns = [
-        {'label': _T("Picture"), 'collapse': true},
-        {'label': _T("Name", "auto")},
-        {'label': _T("Owner", "auto")},
-        {'label': _T("Brand", "auto")},
-        {'label': _T("Model", "auto")},
-        {'label': _T("Description", "auto")},
-    ] %}
-    {{ parent() }}
-{% endblock %}
-
 {% block body %}
     {% for auto in autos %}
         {% set brand = auto.getModel().getBrand() %}
@@ -86,36 +83,13 @@
             </td>
         </tr>
     {% else %}
-        <tr><td colspan="6" class="emptylist">{{ _T("No car in the database", "auto") }}</td></tr>
+        <tr><td colspan="{{ columns_count }}" class="emptylist">{{ _T("No car in the database", "auto") }}</td></tr>
     {% endfor %}
 {% endblock %}
 
 {% block javascripts %}
     {{ parent() }}
     <script type="text/javascript">
-        $(function() {
-            $('.vehicle-history').on('click', function() {
-                $.ajax({
-                    url: $(this).data('url'),
-                    success: function(res) {
-                        $('body').modal({
-                            title: '{{ _T("Car's history", "auto")|e('js') }}',
-                            content: res,
-                            class: 'large'
-                        }).modal('show');
-                    },
-                    error: function() {
-                        {% include "elements/js/modal.js.twig" with {
-                            modal_title_twig: _T("An error occurred displaying history :(", "auto")|e("js"),
-                            modal_without_content: true,
-                            modal_class: "mini",
-                            modal_deny_only: true,
-                            modal_cancel_text: _T("Close")|e("js"),
-                            modal_classname: "redalert",
-                        } %}
-                    }
-                });
-            });
-        });
+        {% include "@PluginGaletteAuto/history_modal.js.twig" %}
     </script>
 {% endblock %}
diff --git a/templates/default/scripts.html.twig b/templates/default/scripts.html.twig
new file mode 100644
index 00000000..46095f90
--- /dev/null
+++ b/templates/default/scripts.html.twig
@@ -0,0 +1,10 @@
+{#
+ # This file is part of Galette Auto plugin (https://galette.eu).
+ # SPDX-FileCopyrightText: Copyright © 2009-2026 The Galette Team
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ #}
+
+{# vehicle form only #}
+{% if cur_route in ['vehicleAdd', 'vehicleEdit', 'doVehicleAdd', 'doVehicleEdit'] %}
+    <script type="text/javascript" src="{{ url_for("plugin_res", {"plugin": module_id, "path": "auto.js"}) }}"></script>
+{% endif %}
diff --git a/templates/default/vehicles.html.twig b/templates/default/vehicles.html.twig
index 0b62afa4..bc6c7d9d 100644
--- a/templates/default/vehicles.html.twig
+++ b/templates/default/vehicles.html.twig
@@ -6,16 +6,26 @@
 
 {% extends 'page.html.twig' %}
 
+{% set can_change_owner = login.isAdmin() or login.isStaff() or login.isGroupManager() %}
+
 {% block content %}
     {% if mode == 'new' %}
         {% set action = url_for("doVehicleAdd") %}
     {% else %}
         {% set action = url_for("doVehicleEdit", {"id": car.getId()}) %}
     {% endif %}
-    <form class="ui form" action="{{ action }}" method="post" id="modifform" enctype="multipart/form-data">
+    <form
+        class="ui form"
+        action="{{ action }}"
+        method="post"
+        id="modifform"
+        enctype="multipart/form-data"
+        data-models-url="{{ url_for("ajaxModels") }}"
+        data-models-placeholder="{{ _T("Choose a model", "auto") }}"
+    >
         <div class="ui styled fluid accordion field">
             <div class="active title">
-                <i class="icon dropdown"></i>
+                <i class="icon dropdown" aria-hidden="true"></i>
                 {{ _T("Car's base informations", "auto") }}
             </div>
             <div class="active content">
@@ -85,7 +95,7 @@
 
         <div class="ui styled fluid accordion field">
             <div class="active title">
-                <i class="icon dropdown"></i>
+                <i class="icon dropdown" aria-hidden="true"></i>
                 {{ _T("Car's photo", "auto") }}
             </div>
             <div class="active content">
@@ -101,7 +111,7 @@
                 <div class="ui file action input">
                     <input id="photo_file" type="file" name="photo"/>
                     <label for="photo_file" class="ui button">
-                        <i class="blue upload icon"></i>
+                        <i class="blue upload icon" aria-hidden="true"></i>
                         {% if car.hasPicture() %}{{ _T("Choose another file") }}{% else %}{{ _T("Choose a file") }}{% endif %}
                     </label>
                 </div>
@@ -110,49 +120,46 @@
 
         <div class="ui styled fluid accordion field">
             <div class="active title">
-                <i class="icon dropdown"></i>
+                <i class="icon dropdown" aria-hidden="true"></i>
                 {{ _T("Current car's state informations", "auto") }}
             </div>
             <div class="active content">
-                <div class="field required">
                 {% if car.getId() %}
-                    <label>{{ _T("Current owner", "auto") }}</label>
-                    <p>
-                        <span>
+                    <div class="field">
+                        <label>{{ _T("Current owner", "auto") }}</label>
+                        <p>
                             {{ car.getOwner().sfullname }}
-                            {% if login.isAdmin() or login.isStaff() or login.isGroupManager() %}
-                                {# Does car's history should be visible by the actual owner? #}
-                                <button type="button" class="ui mini basic icon button" data-url="{{ url_for("vehicleHistory", {"id": car.getId()}) }}" title="{{ _T("Show full car state history", "auto") }}" id="state_history">
-                                    <i class="ui history icon" aria-hidden="true"></i>
-                                    <span class="visually-hidden">{{ _T("Car state history", "auto") }}</span>
-                                </button>
-
-                                <div id="change_owner-checkbox" class="ui toggle checkbox">
-                                    <input type="checkbox" name="change_owner" id="change_owner" value="1"/>
-                                    <label for="attach"><i class="linkify icon"></i> {{ _T("Change car's owner", "auto") }}</label>
-                                </div>
-                            {% endif %}
-                        </span>
-                    </p>
+                            <button type="button" class="ui mini basic icon button vehicle-history" data-url="{{ url_for("vehicleHistory", {"id": car.getId()}) }}" title="{{ _T("Show full car state history", "auto") }}">
+                                <i class="ui history icon" aria-hidden="true"></i>
+                                <span class="visually-hidden">{{ _T("Car state history", "auto") }}</span>
+                            </button>
+                        </p>
+                        {% if can_change_owner %}
+                            <div id="change_owner-checkbox" class="ui toggle checkbox">
+                                <input type="checkbox" name="change_owner" id="change_owner" value="1"/>
+                                <label for="change_owner"><i class="linkify icon" aria-hidden="true"></i> {{ _T("Change car's owner", "auto") }}</label>
+                            </div>
+                        {% endif %}
+                    </div>
                 {% else %}
-                    <input type="hidden" name="change_owner" id="change_owner" value="1"/>
+                    <input type="hidden" name="change_owner" value="1"/>
                 {% endif %}
 
-                {% if login.isAdmin() or login.isStaff() or login.isGroupManager() %}
-                    {% set cclass = 'field' %}
-                    {% if car.getId() %}{% set cclass = cclass ~ ' displaynone' %}{% endif %}
+                {% if can_change_owner %}
                     {% include 'components/forms/member_dropdown.html.twig' with {
                         'required': true,
                         'component_id': 'owner_id_elt',
                         'id': 'owner_id',
                         'label': _T("Owner", "auto"),
                         'value': car.getOwnerId(),
-                        'component_class': cclass
+                        'component_class': car.getId() ? 'field displaynone' : 'field'
                     } %}
-                </div>
-                {% else %}
-                    <input type="hidden" name="owner" value="{{ car.getOwnerId() }}"/>
-                    {{ members.list[car.getOwnerId()] }}
+                {% elseif not car.getId() %}
+                    {# simple members only own their vehicles #}
+                    <div class="field">
+                        <label>{{ _T("Owner", "auto") }}</label>
+                        <p>{{ login.loggedInAs(true) }}</p>
+                    </div>
                 {% endif %}
 
                 {% set color_list_values = {(-1): _T("Choose a color", "auto")} %}
@@ -193,7 +200,7 @@
 
         <div class="ui styled fluid accordion field">
             <div class="active title">
-                <i class="icon dropdown"></i>
+                <i class="icon dropdown" aria-hidden="true"></i>
                 {{ _T("Car's technical informations", "auto") }}
             </div>
             <div class="active content">
@@ -274,7 +281,7 @@
 
         <div class="ui styled fluid accordion field">
             <div class="active title">
-                <i class="icon dropdown"></i>
+                <i class="icon dropdown" aria-hidden="true"></i>
                 {{ _T("Comment", "auto") }}
             </div>
             <div class="active content">
@@ -289,7 +296,7 @@
 
         <div class="ui basic center aligned fitted segment">
             <button type="submit" name="valid" class="action ui labeled icon primary button">
-                <i class="save icon"></i> {{ _T("Save") }}
+                <i class="save icon" aria-hidden="true"></i> {{ _T("Save") }}
             </button>
             <input type="hidden" name="{{ mode }}" value="1"/>
             <input type="hidden" name="id_car" value="{{ car.getId() }}"/>
@@ -298,60 +305,12 @@
 {% endblock %}
 
 {% block javascripts %}
-        <script type="text/javascript">
-            {% include "elements/js/choose_adh.js.twig" with {"js_chosen_id": "#owner_id"} %}
-
-            $(function() {
-                $('#brand').dropdown('setting', 'onChange', function(id_brand) {
-                        // Get the new list for selected brand, and append it to models on the page
-                        $.post(
-                            '{{ url_for("ajaxModels") }}',
-                            {
-                                brand: id_brand
-                            },
-                            function(data){
-                                var _models = new Array();
-                                _models.push({value: '-1', name: "{{ _T("Choose a model", "auto")|e('js') }}"});
-                                $(data).each(function(i){
-                                    var _data = data[i];
-                                    _models.push({name: _data.model, value: _data.id_model});
-                                });
-                                $('#model').dropdown('change values', _models);
-                                $('#model').dropdown('set selected', -1);
-                            },
-                            'json'
-                        );
-                    }
-                );
-    {% if login.isAdmin() or login.isStaff() or login.isGroupManager() %}
-                {# Popup for owner change #}
-                $('#change_owner-checkbox').checkbox({
-                    onChecked: function() {
-                        $('#owner_id_elt').removeClass('displaynone');
-                    },
-                    onUnchecked: function() {
-                        $('#owner_id_elt').addClass('displaynone');
-                    }
-                });
-
-        {% if mode != 'new' %}
-                $('#state_history').on('click', function() {
-                    $.ajax({
-                        url: $(this).data('url'),
-                        success: function(res){
-                            _history_dialog(res);
-                        }
-                    });
-                });
-
-                var _history_dialog = function(res) {
-                    $('body').modal({
-                        title: '{{ _T("Car's history", "auto")|e('js') }}',
-                        content: res
-                    }).modal('show');
-                }
-        {% endif %}
+    <script type="text/javascript">
+    {% if can_change_owner %}
+        {% include "elements/js/choose_adh.js.twig" with {"js_chosen_id": "#owner_id"} %}
+    {% endif %}
+    {% if car.getId() %}
+        {% include "@PluginGaletteAuto/history_modal.js.twig" %}
     {% endif %}
-            });
-        </script>
+    </script>
 {% endblock %}
diff --git a/templates/default/vehicles_list.html.twig b/templates/default/vehicles_list.html.twig
index c02785c7..7dd8ad2e 100644
--- a/templates/default/vehicles_list.html.twig
+++ b/templates/default/vehicles_list.html.twig
@@ -9,6 +9,14 @@
 
 {% set nb = autos|length %}
 
+{% set columns = [
+    {'label': _T("ID"), 'collapse': true},
+    {'label': _T("Name", "auto")},
+    {'label': _T("Owner", "auto")},
+    {'label': _T("Brand", "auto")},
+    {'label': _T("Model", "auto")},
+] %}
+
 {% set form = {
     'route': {
         'name': 'vehiclesList'
@@ -36,20 +44,6 @@
     </a>
 {% endblock %}
 
-{% block header %}
-    {% set columns = [
-        {
-            'label': '',
-            'collapse': true
-        },
-        {'label': _T("Name", "auto")},
-        {'label': _T("Owner", "auto")},
-        {'label': _T("Brand", "auto")},
-        {'label': _T("Model", "auto")},
-    ] %}
-    {{ parent() }}
-{% endblock %}
-
 {% block body %}
     {% for auto in autos %}
         {% set brand = auto.getModel().getBrand() %}
@@ -58,7 +52,8 @@
         <tr>
             <td class="collapsing" data-scope="row">
                 <span class="ui checkbox">
-                    <input type="checkbox" name="entries_sel[]" value="{{ auto.getId() }}"/>
+                    <input type="checkbox" name="entries_sel[]" id="entry_sel_{{ auto.getId() }}" value="{{ auto.getId() }}"/>
+                    <label for="entry_sel_{{ auto.getId() }}">{{ auto.getId() }}</label>
                 </span>
             </td>
             <td data-col-label="{{ _T("Name", "auto") }}"><a href="{{ edit_link }}">{{ auto.getName() }}</a></td>
@@ -94,7 +89,7 @@
             </td>
         </tr>
     {% else %}
-        <tr><td colspan="6" class="emptylist">{% if show_mine == 1 %}{{ _T("No car has been registered yet for your account.", "auto") }}{% else %}{{ _T("No car in the database", "auto") }}{% endif %}</td></tr>
+        <tr><td colspan="{{ columns_count }}" class="emptylist">{% if show_mine == 1 %}{{ _T("No car has been registered yet for your account.", "auto") }}{% else %}{{ _T("No car in the database", "auto") }}{% endif %}</td></tr>
     {% endfor %}
 {% endblock %}
 
diff --git a/tests/GaletteAuto/Controllers/tests/units/Controller.php b/tests/GaletteAuto/Controllers/tests/units/Controller.php
index b566e3ae..fa67c153 100644
--- a/tests/GaletteAuto/Controllers/tests/units/Controller.php
+++ b/tests/GaletteAuto/Controllers/tests/units/Controller.php
@@ -855,7 +855,7 @@ public function testPublicListHistory(): void
     }
 
     /**
-     * Vehicle form opens history with a button
+     * Vehicle form opens history with a button, for the owner too
      */
     public function testFormHistoryButton(): void
     {
@@ -863,10 +863,24 @@ public function testFormHistoryButton(): void
         $this->logSuperAdmin();
         $test_response = $this->app->handle($this->createRequest('vehicleEdit', ['id' => (string)$car_id]));
         $this->expectOK($test_response);
+        $body = (string)$test_response->getBody();
         $this->assertMatchesRegularExpression(
-            '#<button type="button" class="ui mini basic icon button" data-url="[^"]*/vehicle/history/' . $car_id . '"#',
-            (string)$test_response->getBody()
+            '#<button type="button" class="ui mini basic icon button vehicle-history" data-url="[^"]*/vehicle/history/' . $car_id . '"#',
+            $body
+        );
+        $this->assertStringContainsString('<label for="change_owner">', $body);
+        $this->login->logout();
+
+        //owner sees history too, but cannot give the vehicle away
+        $this->logMember($this->dataAdherentOne());
+        $test_response = $this->app->handle($this->createRequest('vehicleEdit', ['id' => (string)$car_id]));
+        $this->expectOK($test_response);
+        $body = (string)$test_response->getBody();
+        $this->assertMatchesRegularExpression(
+            '#<button type="button" class="ui mini basic icon button vehicle-history" data-url="[^"]*/vehicle/history/' . $car_id . '"#',
+            $body
         );
+        $this->assertStringNotContainsString('change_owner', $body);
     }
 
     /**
diff --git a/webroot/auto.js b/webroot/auto.js
new file mode 100644
index 00000000..ba4c12f3
--- /dev/null
+++ b/webroot/auto.js
@@ -0,0 +1,46 @@
+/**
+ * This file is part of Galette Auto plugin (https://galette.eu).
+ * SPDX-FileCopyrightText: Copyright © 2009-2026 The Galette Team
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/* Vehicle form: models follow the chosen brand, and the owner can only be
+ * changed once asked for.
+ */
+var _autoVehicleForm = function() {
+    var $form = $('#modifform');
+    if ($form.length === 0) {
+        return;
+    }
+
+    $('#brand').dropdown('setting', 'onChange', function(id_brand) {
+        $.post(
+            $form.data('models-url'),
+            {
+                brand: id_brand
+            },
+            function(data) {
+                var _models = [{value: '-1', name: $form.data('models-placeholder')}];
+                $(data).each(function(i) {
+                    _models.push({name: data[i].model, value: data[i].id_model});
+                });
+                $('#model').dropdown('change values', _models);
+                $('#model').dropdown('set selected', -1);
+            },
+            'json'
+        );
+    });
+
+    $('#change_owner-checkbox').checkbox({
+        onChecked: function() {
+            $('#owner_id_elt').removeClass('displaynone');
+        },
+        onUnchecked: function() {
+            $('#owner_id_elt').addClass('displaynone');
+        }
+    });
+};
+
+$(function() {
+    _autoVehicleForm();
+});