diff --git a/legal.html b/legal.html
index dad510f..ef25bbe 100644
--- a/legal.html
+++ b/legal.html
@@ -52,15 +52,15 @@
         <h1>Legal Notice</h1>
         <p>This is a legal notice for the website private.coffee</p>
         <p>The website private.coffee is run by the following entity:</p>
-        <p>
+        <address>
           Private.coffee<br />
           c/o Klaus-Uwe Mitterer<br />
           Gartengasse 22/7/3<br />
           8010 Graz<br />
-          Austria
-        </p>
+          Austria<br />
+        </address>
         <p>
-          Contact:
+          Email:
           <a href="mailto:support@private.coffee">support@private.coffee</a>
         </p>
       </div>
diff --git a/privacy.html b/privacy.html
index a49024d..02523da 100644
--- a/privacy.html
+++ b/privacy.html
@@ -68,12 +68,14 @@
           For the purposes of this privacy policy, the data controller for
           private.coffee is:
         </p>
-        <p>
-          Klaus-Uwe Mitterer<br />
+        <address>
+          Private.coffee<br />
+          c/o Klaus-Uwe Mitterer<br />
           Gartengasse 22/7/3<br />
           8010 Graz<br />
           Austria<br />
-          <br />
+        </address>
+        <p>
           Email:
           <a href="mailto:support@private.coffee">support@private.coffee</a>
         </p>
diff --git a/terms.html b/terms.html
index 188e9a3..c81d96d 100644
--- a/terms.html
+++ b/terms.html
@@ -39,7 +39,9 @@
             <a class="dropdown-item" href="https://status.private.coffee"
               >Clearnet</a
             >
-            <a class="dropdown-item" href="http://status.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion/"
+            <a
+              class="dropdown-item"
+              href="http://status.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion/"
               >Tor</a
             >
           </div>
@@ -60,13 +62,14 @@
           For the purposes of these terms of service, the website private.coffee
           is run by:
         </p>
-        <p>
+        <address>
           Private.coffee<br />
           c/o Klaus-Uwe Mitterer<br />
           Gartengasse 22/7/3<br />
           8010 Graz<br />
           Austria<br />
-          <br />
+        </address>
+        <p>
           Email:
           <a href="mailto:support@private.coffee">support@private.coffee</a>
         </p>