diff --git a/ram/portal/templates/cards/company.html b/ram/portal/templates/cards/company.html
index 04307b8..7b4d171 100644
--- a/ram/portal/templates/cards/company.html
+++ b/ram/portal/templates/cards/company.html
@@ -7,10 +7,12 @@
             <table class="table table-striped">
               <thead>
                 <tr>
-                  <th scope="row">Company</th>
-                  {% if d.item.freelance %}
-                  <th class="text-end" scope="row"><span class="badge text-bg-secondary">Freelance</span></th>
-                  {% endif %}
+                  <th colspan="2" scope="row">
+                    Company
+                    {% if d.item.freelance %}
+                    <span class="mt-1 float-end badge text-bg-secondary">Freelance</span>
+                    {% endif %}
+                  </th>
                 </tr>
               </thead>
               <tbody class="table-group-divider">
@@ -32,12 +34,6 @@
                   <th class="w-33" scope="row">Country</th>
                   <td><img src="{{ d.item.country.flag }}" alt="{{ d.item.country }}"> {{ d.item.country.name }}</td>
                 </tr>
-               {% if d.item.freelance %}
-               <tr>
-                  <th class="w-33" scope="row">Notes</th>
-                  <td>A <em>freelance</em> company</td>
-                </tr>
-               {% endif %}
               </tbody>
             </table>
             <div class="d-grid gap-2 mb-1 d-md-block">
diff --git a/ram/portal/templates/cards/consist.html b/ram/portal/templates/cards/consist.html
index 85bc81e..aa632d5 100644
--- a/ram/portal/templates/cards/consist.html
+++ b/ram/portal/templates/cards/consist.html
@@ -24,10 +24,12 @@
             <table class="table table-striped">
               <thead>
                 <tr>
-                  <th scope="row">Consist</th>
-                  {% if d.item.company.freelance %}
-                  <th class="text-end" scope="row"><span class="badge text-bg-secondary">Freelance</span></th>
-                  {% endif %}
+                  <th colspan="2" scope="row">
+                    Consist
+                    {% if d.item.company.freelance %}
+                    <span class="mt-1 float-end badge text-bg-secondary">Freelance</span>
+                    {% endif %}
+                  </th>
                 </tr>
               </thead>
               <tbody class="table-group-divider">
diff --git a/ram/portal/templates/cards/roster.html b/ram/portal/templates/cards/roster.html
index 3936cdb..4b7785d 100644
--- a/ram/portal/templates/cards/roster.html
+++ b/ram/portal/templates/cards/roster.html
@@ -22,10 +22,12 @@
               <table class="table table-striped">
                 <thead>
                   <tr>
-                    <th scope="row">Rolling stock</th>
-                    {% if d.item.rolling_class.company.freelance %}
-                    <th class="text-end" scope="row"><span class="badge text-bg-secondary">Freelance</span></th>
-                    {% endif %}
+                    <th colspan="2" scope="row">
+                      Rolling stock
+                      {% if d.item.rolling_class.company.freelance %}
+                      <span class="mt-1 float-end badge text-bg-secondary">Freelance</span>
+                      {% endif %}
+                    </th>
                   </tr>
                 </thead>
                 <tbody class="table-group-divider">
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 33d48c4..f7552af 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -79,10 +79,12 @@
                 <table class="table table-striped">
                   <thead>
                     <tr>
-                      <th scope="row">Consist</th>
-                      {% if consist.company.freelance %}
-                      <th class="text-end" scope="row"><span class="badge text-bg-secondary">Freelance</span></th>
-                      {% endif %}
+                      <th colspan="2" scope="row">
+                        Consist
+                        {% if consist.company.freelance %}
+                        <span class="mt-1 float-end badge text-bg-secondary">Freelance</span>
+                        {% endif %}
+                      </th>
                     </tr>
                   </thead>
                   <tbody class="table-group-divider">
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index f3d0b39..ef85902 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -73,10 +73,12 @@
                   <table class="table table-striped">
                     <thead>
                       <tr>
-                        <th scope="row">Rolling stock</th>
-                        {% if company.freelance %}
-                        <th class="text-end" scope="row"><span class="badge text-bg-secondary">Freelance</span></th>
-                        {% endif %}
+                        <th colspan="2" scope="row">
+                          Rolling stock
+                          {% if company.freelance %}
+                          <span class="mt-1 float-end badge text-bg-secondary">Freelance</span>
+                          {% endif %}
+                        </th>
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
@@ -290,10 +292,12 @@
                   <table class="table table-striped">
                     <thead>
                       <tr>
-                        <th scope="row">Company data</th>
-                        {% if company.freelance %}
-                        <th class="text-end" scope="row"><span class="badge text-bg-secondary">Freelance</th>
-                        {% endif %}
+                        <th colspan="2" scope="row">
+                          Company data
+                          {% if company.freelance %}
+                          <span class="mt-1 float-end badge text-bg-secondary">Freelance</span>
+                          {% endif %}
+                        </th>
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">