diff --git a/accounts/templates/account.html b/accounts/templates/account.html
index a3b1166..616f602 100644
--- a/accounts/templates/account.html
+++ b/accounts/templates/account.html
@@ -20,8 +20,8 @@
                 <table class="table table-bordered table-hover">
                     <thead>
                         <tr>
-                            <th>{% trans "Key name" %}</th>
-                            <th>{% trans "Public key" %}</th>
+                            <th scope="col">{% trans "Key name" %}</th>
+                            <th scope="col">{% trans "Public key" %}</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -52,12 +52,12 @@
                     <table class="table table-bordered table-hover">
                         <thead>
                             <tr>
-                                <th>#</th>
-                                <th>{% trans "Instance" %}</th>
-                                <th>{% trans "VNC" %}</th>
-                                <th>{% trans "Resize" %}</th>
-                                <th>{% trans "Delete" %}</th>
-                                <th colspan="2">{% trans "Action" %}</th>
+                                <th scope="col">#</th>
+                                <th scope="col">{% trans "Instance" %}</th>
+                                <th scope="col">{% trans "VNC" %}</th>
+                                <th scope="col">{% trans "Resize" %}</th>
+                                <th scope="col">{% trans "Delete" %}</th>
+                                <th scope="colgroup" colspan="2">{% trans "Action" %}</th>
                             </tr>
                         </thead>
                         <tbody>
diff --git a/accounts/templates/accounts-list.html b/accounts/templates/accounts-list.html
index c149dd2..b645d52 100644
--- a/accounts/templates/accounts-list.html
+++ b/accounts/templates/accounts-list.html
@@ -30,11 +30,11 @@
                         <table class="table table-striped table-hover">
                             <thead>
                                 <tr>
-                                    <th>{% trans "Username" %}</th>
-                                    <th>{% trans "Status" %}</th>
-                                    <th>{% trans "Staff" %}</th>
-                                    <th>{% trans "Superuser" %}</th>
-                                    <th>{% trans "Clone" %}</th>
+                                    <th scope="col">{% trans "Username" %}</th>
+                                    <th scope="col">{% trans "Status" %}</th>
+                                    <th scope="col">{% trans "Staff" %}</th>
+                                    <th scope="col">{% trans "Superuser" %}</th>
+                                    <th scope="col">{% trans "Clone" %}</th>
                                 </tr>
                             </thead>
                             <tbody class="searchable">
diff --git a/admin/templates/admin/logs.html b/admin/templates/admin/logs.html
index 8f42f68..0cbdede 100644
--- a/admin/templates/admin/logs.html
+++ b/admin/templates/admin/logs.html
@@ -27,11 +27,11 @@
                     <table class="table table-bordered table-hover">
                         <thead>
                             <tr>
-                                <th>#</th>
-                                <th>{% trans "Date" %}</th>
-                                <th>{% trans "User" %}</th>
-                                <th>{% trans "Instance" %}</th>
-                                <th>{% trans "Message" %}</th>
+                                <th scope="col">#</th>
+                                <th scope="col">{% trans "Date" %}</th>
+                                <th scope="col">{% trans "User" %}</th>
+                                <th scope="col">{% trans "Instance" %}</th>
+                                <th scope="col">{% trans "Message" %}</th>
                                 </tr>
                         </thead>
                         <tbody>
diff --git a/create/templates/create_instance_w2.html b/create/templates/create_instance_w2.html
index 18b671c..10a0f1a 100644
--- a/create/templates/create_instance_w2.html
+++ b/create/templates/create_instance_w2.html
@@ -77,12 +77,12 @@
                                 <table class="table table-bordered table-hover">
                                 <thead>
                                 <tr>
-                                    <th>#</th>
-                                    <th>{% trans "Name" %}</th>
-                                    <th>{% trans "VCPU" %}</th>
-                                    <th>{% trans "RAM" %}</th>
-                                    <th>{% trans "HDD" %}</th>
-                                    <th colspan="2">{% trans "Action" %}</th>
+                                    <th scope="col">#</th>
+                                    <th scope="col">{% trans "Name" %}</th>
+                                    <th scope="col">{% trans "VCPU" %}</th>
+                                    <th scope="col">{% trans "RAM" %}</th>
+                                    <th scope="col">{% trans "HDD" %}</th>
+                                    <th scope="colgroup" colspan="2">{% trans "Action" %}</th>
                                 </tr>
                                 </thead>
                                 <tbody>
diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html
index f034c38..183744f 100644
--- a/instances/templates/allinstances.html
+++ b/instances/templates/allinstances.html
@@ -53,11 +53,11 @@
                 <table class="table table-hover table-striped sortable-theme-bootstrap" data-sortable>
                     <thead>
                         <tr>
-                            <th>{% trans 'Name' %}</th>
-                            <th>{% trans 'Status' %}</th>
-                            <th>{% trans 'VCPU' %}</th>
-                            <th>{% trans 'Memory' %}</th>
-                            <th data-sortable="false" style="width: 165px;">{% trans 'Actions' %}</th>
+                            <th scope="col">{% trans 'Name' %}</th>
+                            <th scope="col">{% trans 'Status' %}</th>
+                            <th scope="col">{% trans 'VCPU' %}</th>
+                            <th scope="col">{% trans 'Memory' %}</th>
+                            <th scope="col" data-sortable="false" style="width: 165px;">{% trans 'Actions' %}</th>
                         </tr>
                     </thead>
                     <tbody class="searchable">
diff --git a/instances/templates/allinstances_index_grouped.html b/instances/templates/allinstances_index_grouped.html
index 9b4b503..feb9b7d 100644
--- a/instances/templates/allinstances_index_grouped.html
+++ b/instances/templates/allinstances_index_grouped.html
@@ -2,13 +2,13 @@
 <table class="table table-hover sortable-theme-bootstrap" data-sortable>
     <thead>
     <tr style="border: 2px solid transparent; ">
-        <th data-sortable="false"><a class="text-secondary" href="#" id="hide_all_instances" onclick="hide_all_host_instances()">#</a></th>
-        <th>{% trans "Name" %}<br>{% trans "Description" %}</th>
-        <th class="d-none d-sm-table-cell">{% trans "User"%}</th>
-        <th>{% trans "Status" %}</th>
-        <th class="d-none d-sm-table-cell">{% trans "VCPU" %}</th>
-        <th class="d-none d-sm-table-cell">{% trans "Memory" %}</th>
-        <th style="width:200px;" data-sortable="false">{% trans "Actions" %} & {% trans "Mem Usage" %}</th>
+        <th scope="col" data-sortable="false"><a class="text-secondary" href="#" id="hide_all_instances" onclick="hide_all_host_instances()">#</a></th>
+        <th scope="col">{% trans "Name" %}<br>{% trans "Description" %}</th>
+        <th scope="col" class="d-none d-sm-table-cell">{% trans "User"%}</th>
+        <th scope="col">{% trans "Status" %}</th>
+        <th scope="col" class="d-none d-sm-table-cell">{% trans "VCPU" %}</th>
+        <th scope="col" class="d-none d-sm-table-cell">{% trans "Memory" %}</th>
+        <th scope="col" style="width:200px;" data-sortable="false">{% trans "Actions" %} & {% trans "Mem Usage" %}</th>
     </tr>
     </thead>
     <tbody class="searchable">
diff --git a/instances/templates/allinstances_index_nongrouped.html b/instances/templates/allinstances_index_nongrouped.html
index 9a4ac8d..8c248a5 100644
--- a/instances/templates/allinstances_index_nongrouped.html
+++ b/instances/templates/allinstances_index_nongrouped.html
@@ -2,12 +2,12 @@
 <table class="table table-hover table-striped sortable-theme-bootstrap" data-sortable>
     <thead>
     <tr>
-        <th>{% trans "Name" %}<br>{% trans "Description" %}</th>
-        <th>{% trans "Host" %}<br>{% trans "User"%}</th>
-        <th>{% trans "Status" %}</th>
-        <th>{% trans "VCPU" %}</th>
-        <th>{% trans "Memory" %}</th>
-        <th style="width:200px;" data-sortable="false">{% trans "Actions" %}</th>
+        <th scope="col">{% trans "Name" %}<br>{% trans "Description" %}</th>
+        <th scope="col">{% trans "Host" %}<br>{% trans "User"%}</th>
+        <th scope="col">{% trans "Status" %}</th>
+        <th scope="col">{% trans "VCPU" %}</th>
+        <th scope="col">{% trans "Memory" %}</th>
+        <th scope="col" style="width:200px;" data-sortable="false">{% trans "Actions" %}</th>
     </tr>
     </thead>
     <tbody class="searchable">
diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 13e3dde..1b6a095 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -551,9 +551,9 @@
                                         <div class="table-responsive">
                                             <table class="table">
                                                 <thead>
-                                                    <th>{% trans "Name" %}</th>
-                                                    <th>{% trans "Date" %}</th>
-                                                    <th colspan="2">{% trans "Action" %}</th>
+                                                    <th scope="col">{% trans "Name" %}</th>
+                                                    <th scope="col">{% trans "Date" %}</th>
+                                                    <th scope="colgroup" colspan="2">{% trans "Action" %}</th>
                                                 </thead>
                                                 <tbody>
                                                 {% for snap in snapshots %}
@@ -823,12 +823,12 @@
                                             <table class="table table-hover mt-3">
                                                 <thead>
                                                     <tr>
-                                                        <th>{% trans "Device" %}</th>
-                                                        <th>{% trans "Used" %}</th>
-                                                        <th>{% trans "Capacity" %}</th>
-                                                        <th>{% trans "Storage" %}</th>
-                                                        <th>{% trans "Source" %}</th>
-                                                        <th>{% trans "Action" %}</th>
+                                                        <th scope="col">{% trans "Device" %}</th>
+                                                        <th scope="col">{% trans "Used" %}</th>
+                                                        <th scope="col">{% trans "Capacity" %}</th>
+                                                        <th scope="col">{% trans "Storage" %}</th>
+                                                        <th scope="col">{% trans "Source" %}</th>
+                                                        <th scope="col">{% trans "Action" %}</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody>
@@ -904,10 +904,10 @@
                                 <table class="table">
                                     <thead>
                                     <tr>
-                                        <th>{% trans 'Name' %}</th>
-                                        <th class="d-none d-table-cell d-sm-table-cell" colspan="6">{% trans 'Info' %}</th>
-                                        <th class="d-none" colspan="2">{% trans 'Info' %}</th>
-                                        <th colspan="2">{% trans 'Actions' %}</th>
+                                        <th scope="col">{% trans 'Name' %}</th>
+                                        <th scope="col" class="d-none d-table-cell d-sm-table-cell" colspan="6">{% trans 'Info' %}</th>
+                                        <th scope="colgroup" class="d-none" colspan="2">{% trans 'Info' %}</th>
+                                        <th scope="colgroup" colspan="2">{% trans 'Actions' %}</th>
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -924,9 +924,9 @@
                                             </td>
                                             <th class="d-none d-table-cell d-sm-table-cell">{% trans 'MAC' %}</th>
                                             <td>{{ network.mac }}</td>
-                                            <th class="d-none d-table-cell d-sm-table-cell">{% trans 'Filter' %}</th>
+                                            <th scope="row" class="d-none d-table-cell d-sm-table-cell">{% trans 'Filter' %}</th>
                                             <td class="d-none d-table-cell">{{ network.filterref|default:"None" }}</td>
-                                            <th class="d-none d-table-cell d-sm-table-cell">{% trans 'Source' %}</th>
+                                            <th scope="row" class="d-none d-table-cell d-sm-table-cell">{% trans 'Source' %}</th>
                                             <td>{{ network.nic }}</td>
                                             <td>
                                             <form method="post" name="edit_network{{ forloop.counter0 }}" role="form">{% csrf_token %}
@@ -1009,15 +1009,15 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th>{% trans 'IPv4' %}</th>
+                                            <th scope="row">{% trans 'IPv4' %}</th>
                                             <td>
                                                 {% for ipv4 in network.ipv4|default:"unknown" %}{{ ipv4 }}{% endfor %}
                                             </td>
-                                            <th>{% trans 'IPv6' %}</th>
+                                            <th scope="row">{% trans 'IPv6' %}</th>
                                             <td>
                                                 {% for ipv6 in network.ipv6|default:"unknown" %}{{ ipv6 }}{% endfor %}
                                             </td>
-                                            <th>{% trans 'Model' %}</th>
+                                            <th scope="row">{% trans 'Model' %}</th>
                                             <td>{{ network.model }}</td>
                                             <th>{% trans 'QoS' %}</th>
                                             <td class="d-flex justify-content-end">
@@ -1044,11 +1044,11 @@
                                 <table class="table table-hover">
                                     <thead>
                                     <tr>
-                                        <th>{% trans "MAC" %}/{% trans "Direction" %}</th>
-                                        <th>{% trans "Average" %}</th>
-                                        <th>{% trans "Peak" %}</th>
-                                        <th>{% trans "Burst" %}</th>
-                                        <th>{% trans "Actions" %}</th>
+                                        <th scope="col">{% trans "MAC" %}/{% trans "Direction" %}</th>
+                                        <th scope="col">{% trans "Average" %}</th>
+                                        <th scope="col">{% trans "Peak" %}</th>
+                                        <th scope="col">{% trans "Burst" %}</th>
+                                        <th scope="col">{% trans "Actions" %}</th>
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -1639,9 +1639,9 @@
                                         <table class="table table-striped sortable-theme-bootstrap" id="logs_table" data-sortable>
                                             <thead>
                                                 <tr>
-                                                    <th>{% trans "Date" %}</th>
-                                                    <th>{% trans "User" %}</th>
-                                                    <th>{% trans "Message" %}</th>
+                                                    <th scope="col">{% trans "Date" %}</th>
+                                                    <th scope="col">{% trans "User" %}</th>
+                                                    <th scope="col">{% trans "Message" %}</th>
                                                 </tr>
                                             </thead>
                                             <tbody class="searchable">
diff --git a/instances/templates/instances.html b/instances/templates/instances.html
index cf001a8..e910798 100644
--- a/instances/templates/instances.html
+++ b/instances/templates/instances.html
@@ -67,12 +67,12 @@
                 <table class="table table-hover sortable-theme-bootstrap" data-sortable>
                     <thead>
                     <tr>
-                        <th>{% trans 'Name' %}<br>{% trans 'Description' %}</th>
-                        <th class="d-none d-md-table-cell">{% trans 'User' %}</th>
-                        <th>{% trans 'Status' %}</th>
-                        <th>{% trans 'VCPU' %}</th>
-                        <th>{% trans 'Memory' %}</th>
-                        <th style="width:200px;" data-sortable="false">{% trans 'Actions' %}</th>
+                        <th scope="col">{% trans 'Name' %}<br>{% trans 'Description' %}</th>
+                        <th scope="col" class="d-none d-md-table-cell">{% trans 'User' %}</th>
+                        <th scope="col">{% trans 'Status' %}</th>
+                        <th scope="col">{% trans 'VCPU' %}</th>
+                        <th scope="col">{% trans 'Memory' %}</th>
+                        <th scope="col" style="width:200px;" data-sortable="false">{% trans 'Actions' %}</th>
                     </tr>
                     </thead>
                     <tbody class="searchable">
diff --git a/networks/templates/network.html b/networks/templates/network.html
index f1c5f1d..5aaf3a3 100644
--- a/networks/templates/network.html
+++ b/networks/templates/network.html
@@ -172,10 +172,10 @@
                 <table id="ipv4_table" class="table table-hover">
                     <thead>
                     <tr>
-                        <th>{% trans "MAC" %}</th>
-                        <th>{% trans "Address" %}</th>
-                        <th>{% trans "Name" %}</th>
-                        <th>{% trans "Actions" %}</th>
+                        <th scope="col">{% trans "MAC" %}</th>
+                        <th scope="col">{% trans "Address" %}</th>
+                        <th scope="col">{% trans "Name" %}</th>
+                        <th scope="col">{% trans "Actions" %}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -281,10 +281,10 @@
                 <table id="ipv6_table" class="table table-hover">
                     <thead>
                     <tr>
-                        <th>{% trans "ID" %}</th>
-                        <th>{% trans "Address" %}</th>
-                        <th>{% trans "Name" %}</th>
-                        <th>{% trans "Actions" %}</th>
+                        <th scope="col">{% trans "ID" %}</th>
+                        <th scope="col">{% trans "Address" %}</th>
+                        <th scope="col">{% trans "Name" %}</th>
+                        <th scope="col">{% trans "Actions" %}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -328,11 +328,11 @@
             <table class="table table-hover">
                 <thead>
                     <tr>
-                        <th>{% trans "Direction" %}</th>
-                        <th>{% trans "Average" %}</th>
-                        <th>{% trans "Peak" %}</th>
-                        <th>{% trans "Burst" %}</th>
-                        <th>{% trans "Actions" %}</th>
+                        <th scope="col">{% trans "Direction" %}</th>
+                        <th scope="col">{% trans "Average" %}</th>
+                        <th scope="col">{% trans "Peak" %}</th>
+                        <th scope="col">{% trans "Burst" %}</th>
+                        <th scope="col">{% trans "Actions" %}</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/nwfilters/templates/nwfilter.html b/nwfilters/templates/nwfilter.html
index 51743c5..40a29e4 100644
--- a/nwfilters/templates/nwfilter.html
+++ b/nwfilters/templates/nwfilter.html
@@ -100,8 +100,8 @@
             <table class="table table-hover mb-3">
                 <thead>
                     <th scope="col">#</th>
-                    <th>{% trans "Reference" %}</th>
-                    <th>{% trans "Action" %}</th>
+                    <th scope="col">{% trans "Reference" %}</th>
+                    <th scope="col">{% trans "Action" %}</th>
                 </thead>
                 <tbody>
                  {% for ref in refs %}
@@ -130,17 +130,17 @@
         <table class="table table-hover">
             <thead>
                 <th scope="col">{% trans "Rule" %}</th>
-                <th class="text-nowrap">{% trans "Action Type" %}</th>
-                <th>{% trans "Direction" %}</th>
-                <th>{% trans "Priority" %}</th>
-                <th>{% trans "Statematch" %}</th>
-                <th>{% trans "Directives" %}</th>
-                <th style="width:30px;">{% trans "Action" %}</th>
+                <th scope="col" class="text-nowrap">{% trans "Action Type" %}</th>
+                <th scope="col">{% trans "Direction" %}</th>
+                <th scope="col">{% trans "Priority" %}</th>
+                <th scope="col">{% trans "Statematch" %}</th>
+                <th scope="col">{% trans "Directives" %}</th>
+                <th scope="col" style="width:30px;">{% trans "Action" %}</th>
             </thead>
             <tbody>
             {% for rule in rules %}
                 <tr>
-                    <td scope="row">{{ forloop.counter }}</td>
+                    <th scope="row">{{ forloop.counter }}</th>
                     <td>{{ rule.action }}</td>
                     <td>{{ rule.direction }}</td>
                     <td>{{ rule.priority }}</td>
diff --git a/nwfilters/templates/nwfilters.html b/nwfilters/templates/nwfilters.html
index 611f90c..d479003 100644
--- a/nwfilters/templates/nwfilters.html
+++ b/nwfilters/templates/nwfilters.html
@@ -55,9 +55,9 @@
                     <thead>
                         <tr>
                             <th scope="col">#</th>
-                            <th>{% trans "UUID" %}</th>
-                            <th>{% trans "Name" %}</th>
-                            <th data-sortable="false" colspan="3">{% trans "Action" %}</th>
+                            <th scope="col">{% trans "UUID" %}</th>
+                            <th scope="col">{% trans "Name" %}</th>
+                            <th scope="colgroup" data-sortable="false" colspan="3">{% trans "Action" %}</th>
                         </tr>
                     </thead>
                     <tbody class="searchable">
diff --git a/secrets/templates/secrets.html b/secrets/templates/secrets.html
index 0e68547..b7904f6 100644
--- a/secrets/templates/secrets.html
+++ b/secrets/templates/secrets.html
@@ -57,9 +57,9 @@
                         <thead>
                         <tr class="active">
                             <th scope="col">{% trans "UUID" %}</th>
-                            <th>{% trans "Type" %}</th>
-                            <th>{% trans "Usage" %}</th>
-                            <th data-sortable="false" style="width:90px;">{% trans "Action" %}</th>
+                            <th scope="col">{% trans "Type" %}</th>
+                            <th scope="col">{% trans "Usage" %}</th>
+                            <th scope="col" data-sortable="false" style="width:90px;">{% trans "Action" %}</th>
                         </tr>
                         </thead>
                         <tbody>
diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index bacc16d..bbc06f4 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -94,12 +94,12 @@
             <table class="table table-hover sortable-theme-bootstrap" data-sortable>
                 <thead>
                 <tr>
-                    <th>#</th>
-                    <th>{% trans "Name" %}</th>
-                    <th>{% trans "Allocated" %}</th>
-                    <th>{% trans "Size" %}</th>
-                    <th>{% trans "Format" %}</th>
-                    <th data-sortable="false" colspan="2">{% trans "Action" %}</th>
+                    <th scope="col">#</th>
+                    <th scope="col">{% trans "Name" %}</th>
+                    <th scope="col">{% trans "Allocated" %}</th>
+                    <th scope="col">{% trans "Size" %}</th>
+                    <th scope="col">{% trans "Format" %}</th>
+                    <th scope="colgroup" data-sortable="false" colspan="2">{% trans "Action" %}</th>
                 </tr>
                 </thead>
                 <tbody class="searchable">