diff --git a/_layouts/page.html b/_layouts/page.html
new file mode 100644
index 00000000..4a137c66
--- /dev/null
+++ b/_layouts/page.html
@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+
+
{{ page.title }}
+ {% if page.description and page.hidedesc != true %}
{{ page.description }}
{% endif %}
+
+
+{{ content }}
diff --git a/pages/browsers.html b/pages/browsers.html
index 4455879f..17f98cec 100644
--- a/pages/browsers.html
+++ b/pages/browsers.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /browsers/
+title: "Web Browsers"
+description: "These are our current web browser recommendations and some tweaks you can use to preserve your privacy."
---
{% include sections/browser-recommendation.html %}
diff --git a/pages/os.html b/pages/os.html
index aeb54387..924ebc33 100644
--- a/pages/os.html
+++ b/pages/os.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /operating-systems/
+title: "Operating Systems"
+description: "Even your own computer could be compromising your privacy. Discover our recommended OS choices for all the devices you use."
---
{% include sections/operating-systems.html %}
diff --git a/pages/providers/dns.html b/pages/providers/dns.html
index af9079f4..9c68315f 100644
--- a/pages/providers/dns.html
+++ b/pages/providers/dns.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/dns/
+title: "Web Browsers"
+description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers."
---
{% include sections/dns.html %}
diff --git a/pages/providers/email.html b/pages/providers/email.html
index 97671466..b05f5785 100644
--- a/pages/providers/email.html
+++ b/pages/providers/email.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/email/
+title: "Email"
+description: "Find an email provider that will keep your privacy in mind. Don't settle for ad-supported platforms."
---
{% include sections/email-providers.html %}
diff --git a/pages/providers/hosting.html b/pages/providers/hosting.html
index 3d72dd42..29d1d407 100644
--- a/pages/providers/hosting.html
+++ b/pages/providers/hosting.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/hosting/
+title: "Web Hosting"
+description: "Find a web hosting provider that won't track your visitors or give into government data requests."
---
{% include sections/hosting-provider.html %}
diff --git a/pages/providers/jurisdiction.html b/pages/providers/jurisdiction.html
index 9f5d5393..ff593e98 100644
--- a/pages/providers/jurisdiction.html
+++ b/pages/providers/jurisdiction.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/jurisdictions/
+title: "Jurisdictions"
+description: "Learn about how certain governments track their citizens and foreigners, and which places to avoid to preserve your privacy online."
---
{% include sections/fourteen-eyes.html %}
diff --git a/pages/providers/paste.html b/pages/providers/paste.html
index 0f70ceff..e312623b 100644
--- a/pages/providers/paste.html
+++ b/pages/providers/paste.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/paste/
+title: "Paste"
+description: "Find a pastebin provider that won't read your content to share sensitive code or other information."
---
{% include sections/paste-services.html %}
diff --git a/pages/providers/search-engines.html b/pages/providers/search-engines.html
index bf750631..f466421a 100644
--- a/pages/providers/search-engines.html
+++ b/pages/providers/search-engines.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/search-engines/
+title: "Search Engines"
+description: "Find a search engine that doesn't track your queries or build an advertising profile based on your searches."
---
{% include sections/search-engines.html %}
diff --git a/pages/providers/social-networks.html b/pages/providers/social-networks.html
index ffb51a84..b9ef5d77 100644
--- a/pages/providers/social-networks.html
+++ b/pages/providers/social-networks.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/social-networks/
+title: "Social Networks"
+description: "Find a social network that doesn't pry into your data or monetize your profile."
---
{% include sections/social-networks.html %}
diff --git a/pages/providers/storage.html b/pages/providers/storage.html
index 1fb1bb4f..a71ec8dc 100644
--- a/pages/providers/storage.html
+++ b/pages/providers/storage.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/cloud-storage/
+title: "Cloud Storage"
+description: "Find a cloud storage provider that won't look through your files."
---
{% include sections/cloud-storage.html %}
diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html
index ebe25cc0..8f2e9f9e 100644
--- a/pages/providers/vpn.html
+++ b/pages/providers/vpn.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /providers/vpn/
+title: "VPN Providers"
+description: "Find a no-logging VPN operator who isn't out to sell or read your web traffic."
---
{% include sections/vpn.html %}
diff --git a/pages/software/cal-card.html b/pages/software/cal-card.html
index e5230a18..d102b7e7 100644
--- a/pages/software/cal-card.html
+++ b/pages/software/cal-card.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/calendar-contacts/
+title: "Calendar/Contacts Sync Tools"
+description: "Discover free, open source, and secure ways to sync your contacts and calendars across your devices."
---
{% include sections/calendar-contacts-sync.html %}
diff --git a/pages/software/cloud.html b/pages/software/cloud.html
index 5aece3aa..a5b35e20 100644
--- a/pages/software/cloud.html
+++ b/pages/software/cloud.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/cloud/
+title: "Self Hosted \"Cloud\""
+description: "Discover how to securely and privately self-host your cloud with open source software."
---
{% include sections/selfhosted-cloud.html %}
diff --git a/pages/software/email.html b/pages/software/email.html
index e6d88eae..57e1f3a7 100644
--- a/pages/software/email.html
+++ b/pages/software/email.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/email/
+title: "Email Clients"
+description: "Discover free, open source, and secure ways email clients, and some email alternatives you may not have considered."
---
{% include sections/email-clients.html %}
diff --git a/pages/software/encryption.html b/pages/software/encryption.html
index 095de253..028ea587 100644
--- a/pages/software/encryption.html
+++ b/pages/software/encryption.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/encryption-tools/
+title: "Encryption Tools"
+description: "Discover free, open source, and secure ways to encrypt your sensitive data to keep it from prying eyes."
---
{% include sections/file-encryption.html %}
diff --git a/pages/software/file-sharing.html b/pages/software/file-sharing.html
index 7d0b359e..cd3e83db 100644
--- a/pages/software/file-sharing.html
+++ b/pages/software/file-sharing.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/file-sharing/
+title: "File Sharing"
+description: "Discover how to share your files with your friends and family or anonymously, without a middleman."
---
{% include sections/file-sharing.html %}
diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html
index 3a575d65..61d260aa 100644
--- a/pages/software/file-sync.html
+++ b/pages/software/file-sync.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/file-sync/
+title: "File Sync Tools"
+description: "Discover free, open source, and secure ways to sync your files across your devices."
---
{% include sections/file-sync.html %}
diff --git a/pages/software/im.html b/pages/software/im.html
index 9e448943..a7d77066 100644
--- a/pages/software/im.html
+++ b/pages/software/im.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/im/
+title: "Instant Messaging"
+description: "Discover secure and private ways to message others online without letting any third parties read your messages."
---
{% include sections/instant-messenger.html %}
diff --git a/pages/software/networks.html b/pages/software/networks.html
index 6bac4a7e..882cbbb7 100644
--- a/pages/software/networks.html
+++ b/pages/software/networks.html
@@ -1,6 +1,9 @@
---
-layout: default
+layout: page
permalink: /software/networks/
+title: "Self-Contained Networks"
+description: "If you are currently browsing clearnet and want to access the dark web, this section is for you."
+hidedesc: true
---
{% include sections/self-contained-networks.html %}
diff --git a/pages/software/notebooks.html b/pages/software/notebooks.html
index 4d3c85d6..e883fe0f 100644
--- a/pages/software/notebooks.html
+++ b/pages/software/notebooks.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/notebooks/
+title: "Notebooks"
+description: "Keep track of your notes and journalings without giving them to a third-party."
---
{% include sections/notebooks.html %}
diff --git a/pages/software/passwords.html b/pages/software/passwords.html
index d3fcdb5c..eeed2e5f 100644
--- a/pages/software/passwords.html
+++ b/pages/software/passwords.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/passwords/
+title: "Password Managers"
+description: "Stay safe and secure online with an encrypted and open-source password manager."
---
{% include sections/password-managers.html %}
diff --git a/pages/software/productivity.html b/pages/software/productivity.html
index a7758a63..d9f2f913 100644
--- a/pages/software/productivity.html
+++ b/pages/software/productivity.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/productivity/
+title: "Productivity Tools"
+description: "Get working and collaborating without sharing your documents with a middleman or trusting a cloud provider."
---
{% include sections/productivity-tools.html %}
diff --git a/pages/software/video-voice.html b/pages/software/video-voice.html
index e7d888f3..f2b9e575 100644
--- a/pages/software/video-voice.html
+++ b/pages/software/video-voice.html
@@ -1,6 +1,8 @@
---
-layout: default
+layout: page
permalink: /software/voip/
+title: "VoIP"
+description: "Find a voice and video messenger that supports completely End-to-End encrypted calls."
---
{% include sections/voice-video-messenger.html %}