diff --git a/_articles/getting-started/how-to-change-your-master-password.md b/_articles/getting-started/how-to-change-your-master-password.md
index edb72347..5602799f 100644
--- a/_articles/getting-started/how-to-change-your-master-password.md
+++ b/_articles/getting-started/how-to-change-your-master-password.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: How to change your master password
-category: Getting Started
+categories: [Getting Started]
 featured: false
 popular: false
 tags: [password, account]
diff --git a/_articles/getting-started/how-to-setup-two-step-login.md b/_articles/getting-started/how-to-setup-two-step-login.md
index cad2651d..e9932c26 100644
--- a/_articles/getting-started/how-to-setup-two-step-login.md
+++ b/_articles/getting-started/how-to-setup-two-step-login.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: How to set up two-step login (2FA)
-category: Getting Started
+categories: [Getting Started]
 featured: false
 popular: false
 tags: [two-step login, 2fa, two factor authentication, account]
diff --git a/_articles/getting-started/import-from-1password.md b/_articles/getting-started/import-from-1password.md
index 7a29ae78..e5be4a01 100644
--- a/_articles/getting-started/import-from-1password.md
+++ b/_articles/getting-started/import-from-1password.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Import Your Account Data From 1Password
-category: Getting Started
+categories: [Getting Started]
 featured: true
 popular: true
 tags: [import, 1password]
diff --git a/_articles/getting-started/import-from-chrome.md b/_articles/getting-started/import-from-chrome.md
index 72490ebd..a74f88d2 100644
--- a/_articles/getting-started/import-from-chrome.md
+++ b/_articles/getting-started/import-from-chrome.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Import Your Account Data From Google Chrome
-category: Getting Started
+categories: [Getting Started]
 featured: true
 popular: true
 tags: [import, chrome]
diff --git a/_articles/getting-started/import-from-lastpass.md b/_articles/getting-started/import-from-lastpass.md
index 964aad5f..8976a4e0 100644
--- a/_articles/getting-started/import-from-lastpass.md
+++ b/_articles/getting-started/import-from-lastpass.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Import Your Account Data From LastPass
-category: Getting Started
+categories: [Getting Started]
 featured: true
 popular: true
 tags: [import, lastpass]
diff --git a/_articles/security/can-bitwarden-see-my-passwords.md b/_articles/security/can-bitwarden-see-my-passwords.md
index 304e0321..c0517fbb 100644
--- a/_articles/security/can-bitwarden-see-my-passwords.md
+++ b/_articles/security/can-bitwarden-see-my-passwords.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Can the bitwarden team see my passwords?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: []
diff --git a/_articles/security/cloud-server-security.md b/_articles/security/cloud-server-security.md
index a8bc85d3..be009ae1 100644
--- a/_articles/security/cloud-server-security.md
+++ b/_articles/security/cloud-server-security.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: How do you keep the cloud servers secure?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: [cloud]
diff --git a/_articles/security/how-is-data-securely-transmitted-and-stored.md b/_articles/security/how-is-data-securely-transmitted-and-stored.md
index 93b8f790..123ce430 100644
--- a/_articles/security/how-is-data-securely-transmitted-and-stored.md
+++ b/_articles/security/how-is-data-securely-transmitted-and-stored.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: How is my data securely trasmitted and stored on bitwarden servers?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: [encryption]
diff --git a/_articles/security/password-salt-hash.md b/_articles/security/password-salt-hash.md
index 872631b0..fbecb47d 100644
--- a/_articles/security/password-salt-hash.md
+++ b/_articles/security/password-salt-hash.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Does bitwarden use a salted hash for my password?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: [encryption, hash]
diff --git a/_articles/security/what-encryption-is-used.md b/_articles/security/what-encryption-is-used.md
index bb60a7ad..6042399c 100644
--- a/_articles/security/what-encryption-is-used.md
+++ b/_articles/security/what-encryption-is-used.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: What encryption is being used?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: [encryption]
diff --git a/_articles/security/what-happens-if-bitwarden-is-hacked.md b/_articles/security/what-happens-if-bitwarden-is-hacked.md
index 2067758d..d882e937 100644
--- a/_articles/security/what-happens-if-bitwarden-is-hacked.md
+++ b/_articles/security/what-happens-if-bitwarden-is-hacked.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: What happens if bitwarden gets hacked?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: [hacked]
diff --git a/_articles/security/where-is-data-stored-cloud.md b/_articles/security/where-is-data-stored-cloud.md
index d9d37835..e548755a 100644
--- a/_articles/security/where-is-data-stored-cloud.md
+++ b/_articles/security/where-is-data-stored-cloud.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Where is my data stored in the cloud?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: [cloud]
diff --git a/_articles/security/where-is-data-stored-computer.md b/_articles/security/where-is-data-stored-computer.md
index 42fb33f1..236df0f1 100644
--- a/_articles/security/where-is-data-stored-computer.md
+++ b/_articles/security/where-is-data-stored-computer.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Where is my data stored on my computer/device?
-category: Security
+categories: [Security]
 featured: true
 popular: false
 tags: []
diff --git a/_articles/security/why-should-i-trust-bitwarden.md b/_articles/security/why-should-i-trust-bitwarden.md
index 5e6b9722..4fabe7c0 100644
--- a/_articles/security/why-should-i-trust-bitwarden.md
+++ b/_articles/security/why-should-i-trust-bitwarden.md
@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Why should I trust bitwarden with my passwords?
-category: Security
+categories: [Security]
 featured: true
 popular: true
 tags: []
diff --git a/_config.yml b/_config.yml
index 083fe1fe..b527fd23 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,4 +11,4 @@ collections:
     permalink: /:path/
   articles:
     output: true
-    permalink: /:path/
+    permalink: /article/:name/
diff --git a/_layouts/article.html b/_layouts/article.html
index 284428c5..c26dbecf 100644
--- a/_layouts/article.html
+++ b/_layouts/article.html
@@ -5,7 +5,6 @@ layout: default
 <div class="container container-content">
     <ol class="breadcrumb">
         <li><a href="/">Help Center</a></li>
-        <li><a href="/{{page.category | slugify}}/">{{page.category}}</a></li>
         <li class="active">{{page.title}}</li>
     </ol>
     <div class="panel panel-default panel-article">
diff --git a/_layouts/category.html b/_layouts/category.html
index 488e5627..17d7274e 100644
--- a/_layouts/category.html
+++ b/_layouts/category.html
@@ -26,7 +26,7 @@ layout: default
         <div class="panel-body">
             <ol>
                 {% for article in site.articles %}
-                {% if article.category == page.title %}
+                {% if article.categories contains page.title %}
                 <li><a href="{{article.url}}">{{article.title}}</a></li>
                 {% endif %}
                 {% endfor %}
diff --git a/index.html b/index.html
index 3731c188..a6e73a9d 100644
--- a/index.html
+++ b/index.html
@@ -27,7 +27,7 @@ title: Help Center
                 <div class="panel-body">
                     <ul>
                         {% for article in site.articles %}
-                        {% if article.category == category.title and article.featured == true %}
+                        {% if article.categories contains category.title and article.featured == true %}
                         <li><a href="{{article.url}}">{{article.title}}</a></li>
                         {% endif %}
                         {% endfor %}