diff --git a/src/views/domain/domain_add.ms b/src/views/domain/domain_add.ms
index fc74e6a3..e496f49e 100644
--- a/src/views/domain/domain_add.ms
+++ b/src/views/domain/domain_add.ms
@@ -66,7 +66,7 @@
 <div class="br"></div>
 
 <div class="text-center">
-    <input type="submit" class="btn btn-success slide back" value="{{t 'add'}}">
+    <input type="submit" https://192.168.33.3/yunohost/admin/#/domains/yolo.test/cert-management class="btn btn-success slide back" value="{{t 'add'}}">
 </div>
 
 </form>
diff --git a/src/views/domain/domain_cert.ms b/src/views/domain/domain_cert.ms
index 1ced40de..09a81312 100644
--- a/src/views/domain/domain_cert.ms
+++ b/src/views/domain/domain_cert.ms
@@ -46,7 +46,7 @@
             <p><span class="fa-fw fa-meh-o"></span>
             {{t 'domain_not_eligible_for_ACME'}}</p>
         {{/if}}
-            <a href="#/domains/{{name}}/cert-install-LE" class="btn btn-success {{#unless status.ACME_eligible}}disabled{{/unless}}">
+            <a href="#/domains/{{name}}/cert-install-LE" role="button" class="btn btn-success {{#unless status.ACME_eligible}}disabled{{/unless}}">
                 <span class="fa-star"></span> {{t 'install_letsencrypt_cert'}}
             </a>
         <hr>
@@ -56,7 +56,7 @@
         <div class="container">
         <p>{{t 'manually_renew_letsencrypt_message'}}</p>
             <a href="#/domains/{{name}}/cert-renew-letsencrypt" class="btn btn-warning">
-                <span class="fa-refresh"></span> {{t 'manually_renew_letsencrypt'}}
+                <span role="button" class="fa-refresh"></span> {{t 'manually_renew_letsencrypt'}}
             </a>
         </div>
         <hr>
@@ -64,7 +64,7 @@
         {{#if actions_enabled.regen_selfsigned}}
         <div class="container">
         <p>{{t 'regenerate_selfsigned_cert_message'}}</p>
-            <a href="#/domains/{{name}}/cert-regen-selfsigned" class="btn btn-warning">
+            <a href="#/domains/{{name}}/cert-regen-selfsigned" role="button" class="btn btn-warning">
                 <span class="fa-refresh"></span> {{t 'regenerate_selfsigned_cert'}}
             </a>
         </div>
@@ -73,7 +73,7 @@
         {{#if actions_enabled.replace_with_selfsigned}}
         <div class="container">
             <p>{{t 'revert_to_selfsigned_cert_message'}}</p>
-            <a href="#/domains/{{name}}/cert-replace-with-selfsigned" class="btn btn-danger">
+            <a href="#/domains/{{name}}/cert-replace-with-selfsigned" role="button" class="btn btn-danger">
                 <span class="fa-exclamation-triangle"></span> {{t 'revert_to_selfsigned_cert'}}
             </a>
         </div>
diff --git a/src/views/domain/domain_info.ms b/src/views/domain/domain_info.ms
index e830ea3b..2a71a981 100644
--- a/src/views/domain/domain_info.ms
+++ b/src/views/domain/domain_info.ms
@@ -32,7 +32,7 @@
     <div class="panel-body">
         <div class="container">
             <p>{{t 'domain_visit_url' url}}</p>
-            <a href="{{url}}" class="btn btn-success" target="_blank">
+            <a role="button" href="{{url}}" class="btn btn-success" target="_blank">
                 {{t 'domain_visit'}} <span class="fa-fw fa-external-link"></span>
             </a>
         </div>
@@ -42,7 +42,7 @@
             <p>{{t 'domain_default_desc'}}</p>
             <form method="POST" action="#/domains">
                     <input type="hidden" name="domain" value="{{name}}" required class="form-control">
-                    <button type="submit" class="btn btn-primary slide back" value="{{t 'set_default'}}">
+                    <button type="submit" role="button" class="btn btn-primary slide back" value="{{t 'set_default'}}">
                         {{t 'set_default'}} <span class="fa-fw fa-star"></span>
                     </button>
             </form>
@@ -51,7 +51,7 @@
         <hr>
         <div class="container">
             <p>{{t 'domain_dns_longdesc'}}</p>
-            <a href="#/domains/{{name}}/dns" class="btn btn-default slide">
+            <a role="button" href="#/domains/{{name}}/dns"  class="btn btn-default slide">
                 {{t 'domain_dns_config'}} <span class="fa-fw fa-globe"></span>
             </a>
         </div>
@@ -63,14 +63,14 @@
             {{t 'certificate_old_letsencrypt_app_conflict'}}
             </p>
             {{/unless}}
-            <a href="#/domains/{{name}}/cert-management" class="btn btn-default slide {{#unless enable_cert_management}}disabled{{/unless}}">
+            <a href="#/domains/{{name}}/cert-management" role="button" class="btn btn-default slide {{#unless enable_cert_management}}disabled{{/unless}}">
                 {{t 'ssl_certificate'}} <span class="fa-fw fa-lock"></span>
             </a>
         </div>
         <hr>
         <div class="container">
             <p>{{t 'domain_delete_longdesc' name}}</p>
-            <a href="#/domains/{{name}}/delete" class="btn btn-danger slide back">
+            <a href="#/domains/{{name}}/delete" role="button" class="btn btn-danger slide back">
                 {{t 'delete'}} <span class="fa-fw fa-trash-o"></span>
             </a>
         </div>
diff --git a/src/views/domain/domain_list.ms b/src/views/domain/domain_list.ms
index ffef47de..db1655d6 100644
--- a/src/views/domain/domain_list.ms
+++ b/src/views/domain/domain_list.ms
@@ -4,7 +4,7 @@
 </div>
 
 <div class="actions-group">
-    <a href="#/domains/add" class="btn btn-success slide">
+    <a role="button" href="#/domains/add" class="btn btn-success slide">
         <span class="fa-plus"></span> {{t 'domain_add'}}
     </a>
 </div>