diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
index 2da8cdd52..8aea6e511 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
@@ -3,15 +3,15 @@
 <#-- Template for Site Administration advanced data tools panel -->
 
 <#if dataTools?has_content>
-    <section class="pageBodyGroup">
+    <section class="pageBodyGroup" role="region">
         <h3>Advanced Data Tools</h3>
         
-        <ul>
-            <li><a href="${dataTools.ingest}">Ingest tools</a></li>
-            <li><a href="${dataTools.rdfData}">Add/Remove RDF data</a></li>
-            <li><a href="${dataTools.rdfExport}">RDF export</a></li>
-            <li><a href="${dataTools.sparqlQuery}">SPARQL query</a></li>
-            <li><a href="${dataTools.sparqlQueryBuilder}">SPARQL query builder</a></li>
+        <ul role="navigation">
+            <li role="listitem"><a href="${dataTools.rdfData}">Add/Remove RDF data</a></li>
+            <li role="listitem"><a href="${dataTools.ingest}">Ingest tools</a></li>
+            <li role="listitem"><a href="${dataTools.rdfExport}">RDF export</a></li>
+            <li role="listitem"><a href="${dataTools.sparqlQuery}">SPARQL query</a></li>
+            <li role="listitem"><a href="${dataTools.sparqlQueryBuilder}">SPARQL query builder</a></li>
         </ul>
     </section>
 </#if>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
index 6835930ad..15a2d0b57 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
@@ -5,15 +5,15 @@
 <#import "lib-form.ftl" as form>
 
 <#if dataInput?has_content>
-    <section class="pageBodyGroup">
+    <section class="pageBodyGroup" role="region">
         <h3>Data Input</h3>
 
         <form action="${dataInput.formAction}" method="get">
-            <select id="VClassURI" name="typeOfNew" class="form-item">
+            <select id="VClassURI" name="typeOfNew" class="form-item" role="select">
                 <@form.optionGroups groups=dataInput.groupedClassOptions />
             </select>
-            <input type="hidden" name="editform" value="newIndividualForm.jsp"/>
-            <input type="submit" id="submit" value="Add individual of this class"/>
+            <input type="hidden" name="editform" value="newIndividualForm.jsp" role="input" />
+            <input type="submit" id="submit" value="Add individual of this class" role="button" />
         </form>
     </section>
 </#if>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
index 660015891..8bd127812 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
@@ -3,24 +3,24 @@
 <#-- Template for the main Site Administration page -->
 
 <#if indexCacheRebuild?has_content>
-    <section class="pageBodyGroup indexCacheRebuild">
+    <section class="pageBodyGroup indexCacheRebuild" role="region">
         <h3>Refresh Content</h3>
         
-        <ul>
-            <#if indexCacheRebuild.rebuildSearchIndex?has_content>
-                <li><a href="${indexCacheRebuild.rebuildSearchIndex }">Rebuild search index</a></li>
+        <ul role="navigation">
+            <#if indexCacheRebuild.rebuildClassGroupCache?has_content>
+                <li role="listitem"><a href="${indexCacheRebuild.rebuildClassGroupCache}">Rebuild class group cache</a></li>
             </#if>
             
-            <#if indexCacheRebuild.rebuildClassGroupCache?has_content>
-                <li><a href="${indexCacheRebuild.rebuildClassGroupCache}">Rebuild class group cache</a></li>
+            <#if indexCacheRebuild.rebuildSearchIndex?has_content>
+                <li role="listitem"><a href="${indexCacheRebuild.rebuildSearchIndex }">Rebuild search index</a></li>
             </#if>
             
             <#if indexCacheRebuild.rebuildVisCache?has_content>
-                <li><a href="${indexCacheRebuild.rebuildVisCache}">Rebuild visualization cache</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.rebuildVisCache}">Rebuild visualization cache</a></li>
             </#if>
             
             <#if indexCacheRebuild.recomputeInferences?has_content>
-                <li><a href="${indexCacheRebuild.recomputeInferences}">Recompute inferences</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}">Recompute inferences</a></li>
             </#if>
         </ul>
     </section>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
index 7c0585e14..e6e891992 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
@@ -3,7 +3,7 @@
 <#-- Template for Site Administration Ontology Editor -->
 
 <#if ontologyEditor?has_content>
-    <section class="pageBodyGroup">
+    <section class="pageBodyGroup" role="region">
         <h3>Ontology Editor</h3>
         
         <#if ontologyEditor.pellet?has_content>
@@ -15,23 +15,22 @@
             </div>
         </#if>
         
-        <ul>
-            <li><a href="${ontologyEditor.urls.ontologies}">Ontology list</a></li>
-        </ul>
-        
         <h4>Class Management</h4>
         
-        <ul>
-            <li><a href="${ontologyEditor.urls.classHierarchy}">Class hierarchy</a></li>
-            <li><a href="${ontologyEditor.urls.classGroups}">Class groups</a></li>
+        <ul role="navigation">
+            <li role="listitem"><a href="${ontologyEditor.urls.classGroups}">Class groups</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.classHierarchy}">Class hierarchy</a></li>
+            
         </ul>
         
         <h4>Property Management</h4>
         
-        <ul>
-            <li><a href="${ontologyEditor.urls.objectPropertyHierarchy}">Object property hierarchy</a></li>
-            <li><a href="${ontologyEditor.urls.dataPropertyHierarchy}">Data property hierarchy</a></li>
-            <li><a href="${ontologyEditor.urls.propertyGroups}">Property groups</a></li>
+        <ul role="navigation">
+            <li role="listitem"><a href="${ontologyEditor.urls.dataPropertyHierarchy}">Data property hierarchy</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.objectPropertyHierarchy}">Object property hierarchy</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.propertyGroups}">Property groups</a></li>
         </ul>
+        
+        <h4><a href="${ontologyEditor.urls.ontologies}">Ontology list</a></h4>
     </section>
 </#if>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index f963a7162..ec170fa24 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -3,38 +3,38 @@
 <#-- Template for Site Administration site configuration panel -->
 
 <#if siteConfig?has_content>
-    <section class="pageBodyGroup">
+    <section class="pageBodyGroup" role="region">
         <h3>Site Configuration</h3>
         
-        <ul>
-            <#if siteConfig.siteInfo?has_content>
-                <li><a href="${siteConfig.siteInfo}">Site information</a></li>
-            </#if>
-            
-            <#if siteConfig.menuManagement?has_content>
-                <li><a href="${siteConfig.menuManagement}">Menu management</a></li>
-            </#if>
-            
+        <ul role="navigation">
             <#if siteConfig.internalClass?has_content>
-                <li><a href="${siteConfig.internalClass}">Institutional internal class</a></li>
-            </#if>
-            
-            <#if siteConfig.userAccounts?has_content>
-                <li><a href="${siteConfig.userAccounts}">User accounts</a></li>
-            </#if>           
+                <li role="listitem"><a href="${siteConfig.internalClass}">Institutional internal class</a></li>
+            </#if>     
             
             <#if siteConfig.manageProxies?has_content>
-                <li><a href="${siteConfig.manageProxies}">Manage Profile Editing</a></li>
-            </#if>           
+                <li role="listitem"><a href="${siteConfig.manageProxies}">Manage profile editing</a></li>
+            </#if>     
+            
+            <#if siteConfig.menuManagement?has_content>
+                <li role="listitem"><a href="${siteConfig.menuManagement}">Menu management</a></li>
+            </#if>      
+            
+            <#if siteConfig.siteInfo?has_content>
+                <li role="listitem"><a href="${siteConfig.siteInfo}">Site information</a></li>
+            </#if>
             
             <#if siteConfig.startupStatus?has_content>
-                <li>
-                    <a href="${siteConfig.startupStatus}">Startup Status</a>
+                <li role="listitem">
+                    <a href="${siteConfig.startupStatus}">Startup status</a>
                     <#if siteConfig.startupStatusAlert>
                         <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alert="Error alert icon" />
                     </#if>
                 </li>
-            </#if>           
+            </#if>   
+            
+             <#if siteConfig.userAccounts?has_content>
+                <li role="listitem"><a href="${siteConfig.userAccounts}">User accounts</a></li>
+             </#if>        
         </ul>
     </section>
 </#if>