diff --git a/lib/functions.sh b/lib/functions.sh
index e3be5fb..86c52e0 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -274,7 +274,7 @@ IMAP: Server is "mail.$DOMAIN" and the port is "993".
 The user and password for the email service is the full email address and password as assigned in Panel
 (see above). Example: rupert@federated.computer, 56tasty23.
 <p>
-<h4>Nextcloud: https://nextcloud.$DOMAIN</h4>
+<h4>Nextcloud: <a href="https://nextcloud.$DOMAIN">https://nextcloud.$DOMAIN</a></h4>
 <p>
 The Nextcloud suite (replacing Google Workplace) provides apps and services covering mail, calendar,
 contacts, notes, tasks, files, word processing, spreadsheets, slides, project management (deck),
@@ -289,7 +289,7 @@ other documentation.
 Username: admin@$DOMAIN<br>
 Password: As given above
 <p>
-<h4>Jitsi: https://jitsi.$DOMAIN</h4>
+<h4>Jitsi: <a href="https://jitsi.$DOMAIN">https://jitsi.$DOMAIN</a></h4>
 <p>
 Jitsi (your Zoom replacement) is a wonderful video conferencing solution. We have tuned Jitsi so that
 your Core can handle video conferences up to 8 people. NOTE, at this time the user and password for
@@ -302,7 +302,7 @@ documentation.
 <p>
 User administration is done in Panel.
 <p>
-<h4>Element: https://element.$DOMAIN</h4>
+<h4>Element: <a href="https://element.$DOMAIN">https://element.$DOMAIN</a></h4>
 <p>
 Element (a Slack replacement) provides you the ability to chat and communicate in real time with those
 on your team and outside of the team.
@@ -317,7 +317,7 @@ easily with users outside your team without giving access to other parts of your
 <p>
 User administration is done in Panel.
 <p>
-  <h4>Listmonk: https://listmonk.$DOMAIN</h4>
+<h4>Listmonk: <a href="https://listmonk.$DOMAIN">https://listmonk.$DOMAIN</a></h4>
 <p>
 Listmonk is a replacement for Mailchimp. You can set up and manage the email lists used to send out
 marketing messages. Listmonk is a single-user system and the user name is "listmonk@$DOMAIN"
@@ -329,7 +329,7 @@ There is only one user for Listmonk:
 Listmonk Admin User: listmonk<br>
 Listmonk Admin Password: $LISTMONKPASS
 <p>
-<h4>Baserow: https://baserow.$DOMAIN</h4>
+<h4>Baserow: <a href="https://baserow.$DOMAIN">https://baserow.$DOMAIN</a></h4>
 <p>
 Baserow (an Airtable replacement) allows you to create customized databases without writing any code.
 It's an amazing product. The user authentication for Baserow is separate from Federated Core. To set up
@@ -339,7 +339,7 @@ https://documentation.federated.computer/docs/core_applications/baserow.
 <p>
 User administration is done in Baserow, but you set up users using the admin user given above.
 <p>
-<h4>Vaultwarden: https://vaultwarden.$DOMAIN</h4>
+<h4>Vaultwarden: <a href="https://vaultwarden.$DOMAIN">https://vaultwarden.$DOMAIN</a></h4>
 <p>
 Vaultwarden is a password manager. The user authentication for Vaultwarden is separate from Federated
 Core. To set up the service, create an account as your "admin@$DOMAIN" user with the
@@ -349,7 +349,7 @@ https://documentation.federated.computer/docs/core_applications/vaultwarden.
 <p>
 User administration is done in Vaultwarden, but you set up users using the admin user created above.
 <p>
-<h4>Gitea: https://gitea.$DOMAIN</h4>
+<h4>Gitea: <a href="https://gitea.$DOMAIN">https://gitea.$DOMAIN</a></h4>
 <p>
 Gitea is a code repository and management system similar to Github. The user authentication is seperate
 from Federated Core. To set up the service, log in as your "gitea@$DOMAIN" user with the
@@ -382,6 +382,7 @@ Endpoint = vpn.$DOMAIN:51820<br>
 AllowedIPs = 172.99.0.0/24<br>
 <p>
 Here is your VPN configuration:<br>
+<br>
 <code>
 
 EOF
@@ -390,9 +391,10 @@ sed "s/$/<br>/" /federated/apps/wireguard/data/config/peer1/peer1.conf >> /feder
 cat >> /federated/apps/mail/data/root/certs/mailfile <<EOF
 
 </code>
+<br>
 Additional information about the VPN service can be found at https://documentation.federated.computer/docs/core_applications/vpn.
 <p>
-  <h4>PowerDNS: https://powerdns.$DOMAIN</h4>
+<h4>PowerDNS: <a href="https://powerdns.$DOMAIN">https://powerdns.$DOMAIN</a></h4>
 <p>
 A very powerful tool for managing the DNS of your domain. Your Federated Core has a number of sub-
 domains pre-configured (examples: mail.domain.com, jitsi.domain.com, etc.) But if you need another