diff --git a/_includes/nav.html b/_includes/nav.html
index f3d26db6..35f5577e 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -69,6 +69,7 @@
             <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
             <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> File Sync</a>
+            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> Metadata Removal Tools</a>
             <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a>
             <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
             <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a>
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 3ccab45c..695a458e 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -14,11 +14,10 @@ labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
-playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
 windows="https://signal.org/download/"
 mac="https://signal.org/download/"
 linux="https://signal.org/download/"
-playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
+googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
 android="https://signal.org/android/apk/#apk-danger"
 ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
 %}
diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html
index 9f9e2004..3ffbd45c 100644
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@@ -46,6 +46,18 @@
   ios="https://itunes.apple.com/app/apple-store/id1000755153"
 %}
 
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
+  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
+  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://framadate.org/">Framadate</a> - A free and open source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
+</ul>
+
 <h1 id="metadata-removal-tools" class="anchor">
   <a href="#metadata-removal-tools"
     ><i class="fas fa-link anchor-icon"></i>
@@ -69,15 +81,3 @@
   netbsd="https://pypi.org/project/mat2/"
 %}
 </div>
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
-  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
-  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
-  <li><a href="https://framadate.org/">Framadate</a> - A free and open source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
-  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite.</li>
-  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
-</ul>
diff --git a/contact.md b/contact.md
index 50a49f09..dc49bda3 100644
--- a/contact.md
+++ b/contact.md
@@ -5,34 +5,22 @@ title: "Contact Us"
 description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues."
 ---
 
-## Editorial Team
+## Suggestions?
 
 It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out.
 
-[<i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse Forum](https://forum.privacytools.io/)
+[<i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum](https://forum.privacytools.io/)
 
-[<i class="fab fa-github fa-lg fa-fw"></i> Open an issue or pull request on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
+[<i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
 
-[<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on reddit](https://www.reddit.com/r/privacytoolsIO/)
+[<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit](https://www.reddit.com/r/privacytoolsIO/)
 
-For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms.
+For complete transparency, software and providers will only be considered for this website after discussions take place on any of the above platforms.
 
-We're on Matrix! Join us at `#general:privacytools.io` to chat with us and other members about this site and privacy in general. If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client!
+## Chat with the Team
 
-## Abuse
+Join our Matrix room at `#general:privacytools.io` or [privacytools_io Keybase team](https://keybase.io/team/privacytools_io) to chat with [us](https://github.com/orgs/privacytoolsIO/people) and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/).
 
-We take the operation of our various [services](/services/) very seriously. Report only <strong>abuse</strong> here: abuse at privacytools dot io.
+## Code of Conduct
 
-<div class="row">
-  <div class="col-12">
-    <div class="card mb-4">
-      <div class="card-header">
-        GitHub Issues
-      </div>
-      <ul class="list-group list-group-flush">
-        <li class="list-group-item"><strong>Searx Issues:</strong> <a href="https://github.com/privacytoolsIO/search">github.com/privacytoolsIO/search</a></li>
-        <li class="list-group-item"><strong>Website Issues:</strong> <a href="https://github.com/privacytoolsIO/privacytools.io">github.com/privacytoolsIO/privacytools.io</a></li>
-      </ul>
-    </div>
-  </div>
-</div>
+We take the operation of our various [services](/services/) very seriously, and adhere to our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md). For any questions or to report abuse, please see our CoC's [Enforcement](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md#enforcement) section.