diff --git a/tpl/agent_fleet.html.twig b/tpl/agent_fleet.html.twig
index a4b7a205..8090c584 100644
--- a/tpl/agent_fleet.html.twig
+++ b/tpl/agent_fleet.html.twig
@@ -11,7 +11,7 @@
       <table class='tab_cadre_fixehov'>
          <tr>
             <th>{{ __('ID') }}</th>
-            <th>{{ __('name') }}</th>
+            <th>{{ __('Name') }}</th>
          </tr>
          {% for agent in agents %}
          {% if loop.index > start and loop.index <= stop %}
diff --git a/tpl/config-messagequeue.html.twig b/tpl/config-messagequeue.html.twig
index 72b3dcfa..4906f1f4 100644
--- a/tpl/config-messagequeue.html.twig
+++ b/tpl/config-messagequeue.html.twig
@@ -66,14 +66,14 @@
          <td>{{ __('Cipher suite (TLS enabled)', 'flyvemdm') }}</td>
          <td><input type="text" name="mqtt_broker_tls_ciphers"
             value="{{ config.mqtt_broker_tls_ciphers }}"></td>
-         <td>{{ __('Mqtt broker cipher suite', 'flyvemdm') }}</td>
+         <td>{{ __('MQTT broker cipher suite', 'flyvemdm') }}</td>
       </tr>
-      <tr class="">
-         <td>test</td>
+      {# <tr class="">
+         <td>Test</td>
          <td><input type="button" id="pluginFlyvemdm-mqtt-test"
-            name="mqtt-test" value="{{ __('test', 'flyvemdm') }}" class="submit"><span
+            name="mqtt-test" value="{{ __('Test connection', 'flyvemdm') }}" class="submit"><span
             id="pluginFlyvemdm-test-feedback"></span></td>
-      </tr>
+      </tr> #}
       <tr>
          <th colspan="3" class="">{{ __('Client certificate server (Broker MQTT with TLS enabled)', 'flyvemdm') }}</th>
       </tr>
@@ -83,7 +83,7 @@
          <td></td>
       </tr>
       <tr class="tab_bg_1">
-         <td>{{ __('Ssl certificate server for MQTT clients', 'flyvemdm') }}</td>
+         <td>{{ __('SSL certificate server for MQTT clients', 'flyvemdm') }}</td>
          <td><input type="text" name="ssl_cert_url" value="{{ config.ssl_cert_url }}"></td>
          <td>{{ __('https://cert.domain.com/path/to/service', 'flyvemdm') }}</td>
       </tr>
diff --git a/tpl/config.html.twig b/tpl/config.html.twig
index 6fb53ef1..97c60af6 100644
--- a/tpl/config.html.twig
+++ b/tpl/config.html.twig
@@ -5,7 +5,7 @@
       </tr>
       <tr class="tab_bg_1">
          <td>{{ __('Allow upload of APK and UPK files', 'flyvemdm') }}</td>
-         <td><input type="submit" class="submit" name="addDocTypes" value="{{ __('add document types', 'flyvemdm') }}"></td>
+         <td><input type="submit" class="submit" name="addDocTypes" value="{{ __('Add document types', 'flyvemdm') }}"></td>
          <td></td>
       </tr>
       <tr>
diff --git a/tpl/file.html.twig b/tpl/file.html.twig
index ced948d9..5db90b17 100644
--- a/tpl/file.html.twig
+++ b/tpl/file.html.twig
@@ -10,7 +10,7 @@
 </tr>
 <tr class='tab_bg_1'>
    <td>
-      {{ __('file size', 'flyvemdm') }}
+      {{ __('File size', 'flyvemdm') }}
    </td>
    <td>
       {{ file.filesize|fileSize }}
diff --git a/tpl/fleet_policy.html.twig b/tpl/fleet_policy.html.twig
index d43cd236..e049b926 100644
--- a/tpl/fleet_policy.html.twig
+++ b/tpl/fleet_policy.html.twig
@@ -2,7 +2,7 @@
    {% if canEdit %}
    {{ addForm.begin|raw }}
    <table class='tab_cadre_fixe'>
-      <tr class='tab_bg_2'><th colspan='2'>{{ __('apply a policy', 'flyvemdm') }}</th></tr>
+      <tr class='tab_bg_2'><th colspan='2'>{{ __('Apply a policy', 'flyvemdm') }}</th></tr>
       <tr>
          <td>{{ __('Policy', 'flyvemdm') }}</td>
          <td>{{ task.policy|raw }}</td>
diff --git a/tpl/package.html.twig b/tpl/package.html.twig
index e9535abf..630eb0e1 100644
--- a/tpl/package.html.twig
+++ b/tpl/package.html.twig
@@ -29,7 +29,7 @@
       {{ package.version }}
    </td>
    <td>
-      {{ __('file size', 'flyvemdm') }}
+      {{ __('File size', 'flyvemdm') }}
    </td>
    <td>
       {{ package.filesize|fileSize }}