diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 7248c1159..4926380cd 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -79,7 +79,7 @@
               <%= button_to 'Se connecter en tant que cet utilisateur', impersonate_admin_user_path(user), data: { turbo: false }, class: 'fr-btn', id: dom_id(user, :impersonate) %>
             <% end %>
           </td>
-        </div>
+        </tr>
       <% end %>
     </tbody>
   </table>
diff --git a/app/views/api_entreprise/endpoints/show.html.erb b/app/views/api_entreprise/endpoints/show.html.erb
index 876c9397e..659ef72de 100644
--- a/app/views/api_entreprise/endpoints/show.html.erb
+++ b/app/views/api_entreprise/endpoints/show.html.erb
@@ -9,10 +9,11 @@
     <div class="fr-col-md-<%= layout_main_bloc %> fr-col-12">
       <p class="fr-text--lead fr-mt-md-2w">
         <%= @endpoint.description %>
-          <span class="fr-mb-0 fr-text--sm">
-            <%= icon(t("endpoint.opening.#{@endpoint.opening}.included_icon", raise: true)) rescue nil %>
-            <%= link_to t("endpoint.opening.#{@endpoint.opening}.included", raise: true), faq_index_path(anchor: 'qu-est-ce-que-les-api-incluses-par-defaut') rescue nil %>
-          </span>
+
+        <span class="fr-mb-0 fr-text--sm">
+          <%= icon(t("endpoint.opening.#{@endpoint.opening}.included_icon", raise: true)) rescue nil %>
+          <%= link_to t("endpoint.opening.#{@endpoint.opening}.included", raise: true), faq_index_path(anchor: 'qu-est-ce-que-les-api-incluses-par-defaut') rescue nil %>
+        </span>
 
         <% if @endpoint.incoming? %>
           <div class="fr-alert fr-alert--info fr-alert--sm fr-mb-2w">
@@ -58,10 +59,12 @@
           </div>
 
           <p class="fr-text--lg fr-text--bold">
-            <% @endpoint.providers.map do |provider| %>
+            <% provider_names = @endpoint.providers.map do |provider| %>
               <%= t("providers.#{provider.name}") %>
-            <% end.join(' & ') %>
-          <p>
+            <% end %>
+
+            <%= provider_names.join(' & ') %>
+          </p>
         </div>
       </div>
     </div>
diff --git a/app/views/api_entreprise/pages/_cgu.html.erb b/app/views/api_entreprise/pages/_cgu.html.erb
index e9e324e1e..40ebcb449 100644
--- a/app/views/api_entreprise/pages/_cgu.html.erb
+++ b/app/views/api_entreprise/pages/_cgu.html.erb
@@ -110,7 +110,6 @@ l’<a href="https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI00003136735
   Le <strong>Partenaire</strong> vérifie qu’il remplit les conditions d’accès présentées dans les présentes CGU et
   effectue sa demande d’adhésion à partir du site internet : <a href="<%= datapass_base_url %>/api-entreprise" target="_blank"><%= datapass_base_url %>/api-entreprise</a>.
 </p>
-</p>
 
 <p>
   Le jeton est émis avec une durée de vie de 18 mois, son expiration est programmée à cette date sauf en cas de révocation précoce. Trois mois avant l’expiration,
diff --git a/app/views/api_particulier/endpoints/show.html.erb b/app/views/api_particulier/endpoints/show.html.erb
index 5eb505868..c61c40052 100644
--- a/app/views/api_particulier/endpoints/show.html.erb
+++ b/app/views/api_particulier/endpoints/show.html.erb
@@ -70,10 +70,12 @@
           </div>
 
           <p class="fr-text--lg fr-text--bold">
-            <% @endpoint.providers.map do |provider| %>
+            <% provider_names = @endpoint.providers.map do |provider| %>
               <%= t("providers.#{provider.name}") %>
-            <% end.join(' & ') %>
-          <p>
+            <% end %>
+
+            <%= provider_names.join(' & ') %>
+          </p>
         </div>
       </div>
     </div>
diff --git a/app/views/shared/authorization_requests/actions/_prolong.html.erb b/app/views/shared/authorization_requests/actions/_prolong.html.erb
index a7dbcacb4..141b6d57b 100644
--- a/app/views/shared/authorization_requests/actions/_prolong.html.erb
+++ b/app/views/shared/authorization_requests/actions/_prolong.html.erb
@@ -4,6 +4,8 @@
     id="<%= dom_id(authorization_request, :prolong_token_modal_link) %>"
     class="fr-btn fr-icon-arrow-right-line fr-btn--icon-right fr-mt-2w"
   >
+    <%= label %>
+  </a>
 <% else %>
   <a
     href="<%= token_prolong_path(id: authorization_request.token.id) %>"
@@ -13,6 +15,6 @@
     data-fr-opened="false"
     data-turbo-frame="main-modal-content"
   >
+    <%= label %>
+  </a>
 <% end %>
-  <%= label %>
-</a>
diff --git a/app/views/shared/authorization_requests/show.html.erb b/app/views/shared/authorization_requests/show.html.erb
index b218dab87..b40ab3520 100644
--- a/app/views/shared/authorization_requests/show.html.erb
+++ b/app/views/shared/authorization_requests/show.html.erb
@@ -53,7 +53,7 @@
               </li>
             </ul>
             </div>
-           
+
           </div>
         </section>
 
@@ -95,6 +95,8 @@
                       id="prolong-token-modal-link"
                       class="fr-btn fr-icon-arrow-right-line fr-btn--icon-right fr-mt-2w"
                     >
+                      <%= prolong_token_label(@main_token) %>
+                    </a>
                   <% else %>
                     <a
                       href="<%= token_prolong_path(id: @main_token.id) %>"
@@ -104,9 +106,9 @@
                       data-fr-opened="false"
                       data-turbo-frame="main-modal-content"
                     >
+                      <%= prolong_token_label(@main_token) %>
+                    </a>
                   <% end %>
-                    <%= prolong_token_label(@main_token) %>
-                  </a>
                 </li>
               <% end %>
               <% if policy(@main_token).ask_for_prolongation? %>
diff --git a/app/views/shared/tokens/prolong.html.erb b/app/views/shared/tokens/prolong.html.erb
index bd5fbb196..c659ad37b 100644
--- a/app/views/shared/tokens/prolong.html.erb
+++ b/app/views/shared/tokens/prolong.html.erb
@@ -3,14 +3,14 @@
     <h3 id="<%= dom_id(@token, :prolong_token_modal_title) %>">
       <i class="fr-icon-arrow-right-line fr-icon--lg"></i>
       <%= t('.title') %>
-    </h1>
+    </h3>
     <p>
       <%= t('.description',
           link_to_datapass: link_to(
-            t('shared.links.to_datapass', external_id: @token.authorization_request.external_id).html_safe, 
-            datapass_authorization_request_url(@token.authorization_request), 
+            t('shared.links.to_datapass', external_id: @token.authorization_request.external_id).html_safe,
+            datapass_authorization_request_url(@token.authorization_request),
             id: :authorization_request_link,
-            class: %w(fr-link), 
+            class: %w(fr-link),
             target: '_blank'),
             remaining_time: distance_of_time_in_words(Time.zone.now, @token.end_timestamp)
           ).html_safe %>