diff --git a/src/certificate-en.js b/src/certificate-en.js
index 8d99a5c..50928a3 100644
--- a/src/certificate-en.js
+++ b/src/certificate-en.js
@@ -16,7 +16,7 @@ library.add(faEye, faFilePdf)
 dom.watch()
 
 $('#radio-language-fr').addEventListener('click', async event => {
-  window.location.href = '/index'
+  window.location.href = `${process.env.PUBLIC_URL === '/' ? '' : process.env.PUBLIC_URL}/index.html`
 })
 
 const generateQR = async text => {
diff --git a/src/certificate.js b/src/certificate.js
index ed363f7..47da583 100644
--- a/src/certificate.js
+++ b/src/certificate.js
@@ -16,7 +16,7 @@ library.add(faEye, faFilePdf)
 dom.watch()
 
 $('#radio-language-en').addEventListener('click', async event => {
-  window.location.href = '/index-en'
+  window.location.href = `${process.env.PUBLIC_URL === '/' ? '' : process.env.PUBLIC_URL}/index-en.html`
 })
 
 const generateQR = async text => {
diff --git a/src/main.css b/src/main.css
index 06fa10e..12f7dde 100644
--- a/src/main.css
+++ b/src/main.css
@@ -47,11 +47,12 @@ svg {
 }
 
 ul.flex-justify {
-   display: flex;
+  display: -webkit-flex; /* Safari */
+  -webkit-align-items: center; /* Safari 7.0+ */
    justify-content:space-between;
    padding: 0;
    margin: 0;
- }
+}
 
 h1.flex.flex-wrap {
   display: flex;