diff --git a/website/site/content/download/mattermost/_index.md b/website/site/content/download/mattermost/_index.md
index 65390c0a2..e872bb346 100644
--- a/website/site/content/download/mattermost/_index.md
+++ b/website/site/content/download/mattermost/_index.md
@@ -5,7 +5,7 @@ section: "download"
 weight: 2
 ---
 
-Focalboard is installed with Mattermost v6.0, where it's called Boards. To access and use Boards, install or upgrade to Mattermost v6.0 or later. Then, select the Product menu in the top left corner of Mattermost and choose **Boards**.
+Focalboard is installed with Mattermost v6.0, where it's called Boards. To access and use Boards, [install or upgrade to Mattermost v6.0 or later](https://mattermost.com/get-started/). Then, select the Product menu in the top left corner of Mattermost and choose **Boards**.
 
 No additional server or web-proxy configuration is required.
 
diff --git a/website/site/content/download/personal-edition/ubuntu.md b/website/site/content/download/personal-edition/ubuntu.md
index fd426ce90..d01f1c540 100644
--- a/website/site/content/download/personal-edition/ubuntu.md
+++ b/website/site/content/download/personal-edition/ubuntu.md
@@ -5,7 +5,7 @@ subsection: Personal Edition
 weight: 2
 ---
 
-Focalboard Personal Server allows your team to work together on shared project boards.
+Focalboard Personal Server is a standalone server for development and personal use. For team use, check out [Mattermost Boards](../../mattermost/), which supports private boards, team communication, and more.
 
 Follow these steps it up on an Ubuntu server. To upgrade an existing installation, see [the upgrade guide](../ubuntu-upgrade).
 
diff --git a/website/site/layouts/partials/hero.html b/website/site/layouts/partials/hero.html
index a060549e1..272793b3f 100755
--- a/website/site/layouts/partials/hero.html
+++ b/website/site/layouts/partials/hero.html
@@ -6,16 +6,21 @@
 			</h2>
 
 			<p>
-				It's a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view. Focalboard comes in two editions:
+				It's a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view. Focalboard comes in two main editions:
 			</p>
 
 			<div class="text-left">
 				<ul >
-					<li><b><a href="https://www.focalboard.com/download/personal-edition/desktop/">Focalboard Personal Desktop</a></b>: A stand-alone desktop app for your todos and personal projects</li>
-					<li><b><a href="https://www.focalboard.com/download/personal-edition/ubuntu/">Focalboard Personal Server</a></b>: A self-hosted server for your team to collaborate</li>
+					<li><b><a href="download/personal-edition/desktop/">Focalboard Personal Desktop</a></b>: A stand-alone single-user desktop app for your todos and personal projects</li>
+					<li><b><a href="download/mattermost/">Mattermost Boards</a></b>: A cloud or self-hosted server for your team to plan and collaborate</li>
 				</ul>
 			</div>
-		</div>
+
+            <p>
+                Focalboard can also be installed as a standalone <a href="download/personal-edition/ubuntu/">personal server</a> for development.
+            </p>
+        </div>
+
 
 		<p class="text-center">
 			<a href="download/personal-edition">