diff --git a/_includes/layouts/homepage.tsx b/_includes/layouts/homepage.tsx
index 4ec6d99..64c983d 100644
--- a/_includes/layouts/homepage.tsx
+++ b/_includes/layouts/homepage.tsx
@@ -29,7 +29,7 @@ export default ({
         )}
         <footer className="ps-footer">
           <a
-            href="https://www.thegreenwebfoundation.org/green-web-check/?url=https%3A%2F%2Fpub.solar"
+            href="https://greenbaum.cloud"
             className="ps-footer--link"
           >climate-neutral hosting by Greenbaum Cloud</a>
         </footer>
diff --git a/about.yml b/about.yml
index 3080c58..b43dafb 100644
--- a/about.yml
+++ b/about.yml
@@ -13,7 +13,7 @@ content:
     * [Matrix](https://chat.pub.solar): a decentralized, end-to-end encrypted chat, similar to Slack or Discord.
     * [Mastodon](https://mastodon.pub.solar): a decentralized microblogging platform, similar to Twitter.
     * [Nextcloud](https://cloud.pub.solar): a cloud with office capabilities, similar to the Google Suite and Microsoft Office 365.
-    * [PubSolarOS](https://get.pub.solar): a GNU+Linux Distribution that is based on NixOS.
+    * [PubSolarOS](https://pub.solar/os/): a GNU+Linux Distribution that is based on NixOS.
 
     Our Mastodon and Matrix instances are publicly open for registration. If you (or your non profit, or your family) would like to use our Nextcloud, send us a message.
 
@@ -38,9 +38,8 @@ content:
 
     ## Our hosting
 
-    Our friends at Greenbaum Cloud (Jhonas works there) are kindly providing us their infrastructure for hosting without charging us. Give them a visit.
-    []
-    <a href=\"https://greenbaum.cloud\"><img src=\"/assets/greenbaum-cloud-logo.svg\" width=\"230\" height=\"auto\"></a>
+    Our friends at Greenbaum Cloud (Jhonas works there) are kindly providing us their infrastructure for [green hosting](https://www.thegreenwebfoundation.org/green-web-check/?url=https%3A%2F%2Fpub.solar) without charging us. Give them a visit.
+    [![Greenbaum Cloud Logo](/assets/greenbaum-cloud-logo.svg)](https://greenbaum.cloud)
 
   de: |
     # Hi! Wir sind pub.solar
@@ -52,7 +51,7 @@ content:
     * [Matrix](https://chat.pub.solar): dezentraler, Ende-zu-Ende verschlüsselter Chat, ähnlich wie Slack oder Discord
     * [Mastodon](https://mastodon.pub.solar): dezentrale Mikrobloggingplattform, ähnlich wie Twitter
     * [Nextcloud](https://cloud.pub.solar): Cloud mit Office Möglichkeiten, ähnlich wie Teile der Google Suite und Microsoft Office 365
-    * [PubSolarOS](https://get.pub.solar), eine Linux Distribution die auf NixOS basiert
+    * [PubSolarOS](https://pub.solar/os/), eine Linux Distribution die auf NixOS basiert
 
     Auf unseren Mastodon und Matrix Instanzen ist die Registrierung für alle offen. Wenn Du (oder dein Verein, oder deine Familie) gerne unsere Nextcloud benutzen möchten, schreib uns gerne an.
 
@@ -76,6 +75,6 @@ content:
 
     ## Unser Hosting
 
-    Unsere Freunde bei der Firma Greenbaum Cloud (Jhonas arbeitet dort auch) sind so cool uns ihre Infrastruktur momentan gratis zur Verfügung zu stellen. Klickt gerne mal rein.
-    <a href=\"https://greenbaum.cloud\"><img src=\"/assets/greenbaum-cloud-logo.svg\" width=\"230\" height=\"auto\"></a>
+    Unsere Freunde bei der Firma Greenbaum Cloud (Jhonas arbeitet dort auch) sind so cool uns ihre Infrastruktur für [grünes Hosting](https://www.thegreenwebfoundation.org/green-web-check/?url=https%3A%2F%2Fpub.solar) momentan gratis zur Verfügung zu stellen. Klickt gerne mal rein.
+    [![Greenbaum Cloud Logo](/assets/greenbaum-cloud-logo.svg)](https://greenbaum.cloud)
 
diff --git a/hakken.yml b/hakken.yml
index 4bfbaed..67e93d0 100644
--- a/hakken.yml
+++ b/hakken.yml
@@ -43,7 +43,7 @@ content:
 
     ## Where do I sign up?
 
-    Write us a short message. You can reach us via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [Mastodon](https://mastodon.pub.solar/@crew), or send a mail to[crew@pub.solar](mailto:crew@pub.solar).
+    Write us a short message. You can reach us via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [Mastodon](https://mastodon.pub.solar/@crew), or send a mail to [crew@pub.solar](mailto:crew@pub.solar).
 
     ## When will this happen?
 
diff --git a/style.css b/style.css
index c5dd892..a6807af 100644
--- a/style.css
+++ b/style.css
@@ -147,6 +147,11 @@ html {
   border-bottom: 4px solid var(--accent);
 }
 
+.ps-page--section img {
+  width: 230px;
+  margin-top: 1rem;
+}
+
 .ps-footer--link,
 .ps-page--link {
   pointer-events: all;