diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index ec9b798..0f3c790 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -5,8 +5,7 @@
 <div class="footer-container">
   <FemtoStarLogo height={42} width={33} color="#FFFFFF75"/>
   <div class="footer-text">
-    femtostar[example].onion<br>
-    Copyright 2021 the FemtoStar Project contributors.
+      Copyright 2021 the FemtoStar Project contributors.
   </div>
 </div>
 
diff --git a/src/components/PartnerContainer.svelte b/src/components/PartnerContainer.svelte
index 39c51c4..a0a334a 100644
--- a/src/components/PartnerContainer.svelte
+++ b/src/components/PartnerContainer.svelte
@@ -1,13 +1,34 @@
+<script>
+    import Faq from "../routes/faq.svelte";
+import FaqItem from "./FAQItem.svelte";
+import FemtoHeader from "./FemtoHeader.svelte";
+import FemtoStarLogo from "./FemtoStarLogo.svelte";
+import PartnerItem from "./PartnerItem.svelte"
+</script>
+
 <style>
     .partner-container{
-        padding-top: 2em;
+        padding-top: 3em;
         width: 100%;
         color: white;
         text-align: center;
     }
+    .partner-text{
+        padding-bottom: 1em;
+    }
+    h2{
+        margin-bottom: 0.1em;
+    }
 </style>
 
 <div class="partner-container">
-    <h2>Our Partners</h2>
+    <div class="partner-text">
+        <h2>Our Partners</h2>
+        The FemtoStar Project is working with an ever-growing community of partners to make FemtoStar a reality.<br>
+    </div>
     
+    <PartnerItem link="https://appliedionsystems.com" alt="Logo of Applied Ion Systems" image="../../ais-logo.png" />
+    <PartnerItem link="https://fossa.systems" alt="Logo of Fossa Systems" image="../../fossa-logo.png" />
+    <PartnerItem link="https://nlnet.nl" alt="Logo of NLNet" image="../../nlnet-logo.png" />
+    <!--<PartnerItem link="https://pine64.org" alt="Logo of Pine64" image="../../pine-logo.png" />-->
 </div>
\ No newline at end of file
diff --git a/src/components/PartnerItem.svelte b/src/components/PartnerItem.svelte
new file mode 100644
index 0000000..d9c6bfd
--- /dev/null
+++ b/src/components/PartnerItem.svelte
@@ -0,0 +1,13 @@
+<script>
+    export let image, alt, link;
+</script>
+
+<a href={link}><img alt={alt} src={image} /></a>
+
+<style>
+    img{
+        margin: 15px;
+        height: 64px;
+        width: auto;
+    }
+</style>
\ No newline at end of file
diff --git a/src/routes/about-contact.svelte b/src/routes/about-contact.svelte
index 4d2dc9a..c1534df 100644
--- a/src/routes/about-contact.svelte
+++ b/src/routes/about-contact.svelte
@@ -42,7 +42,11 @@
           href="https://matrix.to/#/!COEHOXujBzfAHAVzPG:matrix.org?via=matrix.org&via=lighthouse.cx&via=nordgedanken.dev"
           >#femtostar:matrix.org</a
         >. Alternatively, email us at
-        <a href="mailto:femtostar@tutanota.com">femtostar@tutanota.com</a>.
+        h<span class="c"> This address has been hidden to prevent spam being received. If you are reading this website as plain text or through a screen reader, the correct address is the word hello, then the symbol spelled with the letter before B and then the letter after S, then the name of this
+          website or of our satellite, then dot com.
+        </span>e<span class="c">Lorem</span>l<span class="j">ipsum</span>l<span class="c">dolor</span>o<span class="c">sit</span> а<span class="c">amet</span>t
+        f<span class="c">consectetur</span>e<span class="j">adipiscing</span>m<span class="c">elit</span>t<span class="c">Sed</span>o<span class="j">dolor</span>s<span class="c">sem</span>t<span class="c">lacinia</span>a<span class="c">ac</span>r
+        d<span class="c">euismod</span>о<span class="j">vitae</span>t c<span class="c">hendrerit</span>o<span class="j">sit</span>m (if you have Tutanota, you can send end-to-end encrypted mail here too).
       </p>
     </TalkingPointContent>
   </TalkingPointContainer>
@@ -103,6 +107,15 @@
     padding-right: 2em;
   }
 
+  .c{
+    top: -100px;
+    position: absolute;
+  }
+  .j{
+    top: -150px;
+    position: absolute;
+  }
+
   :global(.site a) {
     color: #72bbd9;
   }
diff --git a/src/routes/faq.svelte b/src/routes/faq.svelte
index c14332c..9ac020c 100644
--- a/src/routes/faq.svelte
+++ b/src/routes/faq.svelte
@@ -305,7 +305,7 @@
           to include electric propulsion onboard our satellites, allowing them
           to be repositioned as needed and cleanly deorbited at end-of-life. The
           FemtoStar Project is working closely with Applied Ion Systems, a
-          leading developer of open-hardware mallsat propulsion hardware, to
+          leading developer of open-hardware smallsat propulsion hardware, to
           develop a specialized implementation of their technology for use
           onboard the FemtoStar space vehicle. Even in the event of a thruster
           failure, the solar panel can be positioned to drastically increase
diff --git a/static/favicon.png b/static/favicon.png
index 7e6f5eb..547afab 100644
Binary files a/static/favicon.png and b/static/favicon.png differ
diff --git a/static/nlnet-logo.png b/static/nlnet-logo.png
new file mode 100644
index 0000000..96f9160
Binary files /dev/null and b/static/nlnet-logo.png differ
diff --git a/static/pine-logo.png b/static/pine-logo.png
new file mode 100644
index 0000000..f66ac53
Binary files /dev/null and b/static/pine-logo.png differ