diff --git a/_data/i18n/pages.yml b/_data/i18n/pages.yml
index 604f7fe..3da9ff1 100644
--- a/_data/i18n/pages.yml
+++ b/_data/i18n/pages.yml
@@ -1,3 +1,68 @@
+all:
+  ee:
+    home:
+      name  : "Esileht"
+      url   : "/"
+    statute:
+      name  : "Põhikiri"
+      url   : "/statute/"
+    history:
+      name  : "Ajalugu"
+      url   : "/history/"
+    members:
+      name  : "Liikmed"
+      url   : "/members/"
+    student:
+      name: "Tudengile"
+      url:  "/student/"
+    mentors:
+      name: "Mentorid"
+      url:  "/mentors/"
+    helpdesk:
+      name: "Helpdesk"
+      url:  "/helpdesk/"
+    ourwork:
+      name: "Ettevõttele"
+      url:  "/ourwork/"
+    aboutus:
+      name: "Lapikutest"
+      url:  "/aboutus/"
+    contact:
+      name: "Kontakt"
+      url:  "/contact/"
+  en:
+    home:
+      name  : "Front page"
+      url   : "/en/"
+    statute:
+      name  : "Statute"
+      url   : "/en/statute/"
+    history:
+      name  : "History"
+      url   : "/en/history/"
+    members:
+      name  : "Members"
+      url   : "/en/members/"
+    student:
+      name: "For students"
+      url:  "/en/student/"
+    mentors:
+      name: "Mentors"
+      url:  "/en/mentors/"
+    helpdesk:
+      name: "Helpdesk"
+      url:  "/en/helpdesk/"
+    ourwork:
+      name: "For businesses"
+      url:  "/en/ourwork/"
+    aboutus:
+      name: "About us"
+      url:  "/en/aboutus/"
+    contact:
+      name: "Contact"
+      url:  "/en/contact/"
+
+# For iterating through and populating navbar
 nav:
   ee:
     student:
@@ -37,31 +102,3 @@ nav:
     contact:
       name  : "Contact"
       url   :  "/en/contact/"
-
-other:
-  ee:
-    home:
-      name  : "Esileht"
-      url   : "/"
-    statute:
-      name  : "Põhikiri"
-      url   : "/statute/"
-    history:
-      name  : "Ajalugu"
-      url   : "/history/"
-    members:
-      name  : "Liikmed"
-      url   : "/members/"
-  en:
-    home:
-      name  : "Front page"
-      url   : "/en/"
-    statute:
-      name  : "Statute"
-      url   : "/en/statute/"
-    history:
-      name  : "History"
-      url   : "/en/history/"
-    members:
-      name  : "Members"
-      url   : "/en/members/"
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index ced1fcd..5df4c27 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,5 @@
 {% assign locale = site.data.i18n.footer[page.language] %}
-{% assign home = site.data.i18n.pages.other[page.language].home %}
+{% assign home = site.data.i18n.pages.all[page.language].home %}
 <footer class="main-footer">
   <section class="container">
     <div class="row">
diff --git a/_includes/header.html b/_includes/header.html
index 43a5215..8d1d89f 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,7 +1,7 @@
 <!-- header.scss -->
-
+{% assign pages = site.data.i18n.pages.all %}
 <nav class="navigation">
-  <a href="{{site.data.i18n.pages.other[page.language].home.url}}" {% if page.url == '/' or page.url == '/en/' %}style="display: none;"{% endif %}>
+  <a href="{{site.data.i18n.pages.all[page.language].home.url}}" {% if page.url == '/' or page.url == '/en/' %}style="display: none;"{% endif %}>
 	<img id="header-logo" class="logo" src="{{ "/assets/logo.svg " | relative_url }}">
   </a>
 
@@ -13,11 +13,10 @@
     </a>
 
     <ul id="main-menu">
-
       {% if page.language == "ee" %}
-      <a href="{{site.data.i18n.pages.other.en.home.url}}">In English</a>
+      <a href="{{ pages.en[page.tag].url }}">In English</a>
       {% elsif page.language == "en" %}
-      <a href="{{site.data.i18n.pages.other.ee.home.url}}">Eesti keeles</a>
+      <a href="{{pages.ee[page.tag].url}}">Eesti keeles</a>
       {% endif %}
 
       {% include main_nav.html %}
diff --git a/_includes/pages/aboutus.html b/_includes/pages/aboutus.html
index 7d17ea1..897ba97 100644
--- a/_includes/pages/aboutus.html
+++ b/_includes/pages/aboutus.html
@@ -1,5 +1,5 @@
 {% assign locale = site.data.i18n.aboutus[page.language] %}
-{% assign subpages = site.data.i18n.pages.other[page.language] %}
+{% assign subpages = site.data.i18n.pages.all[page.language] %}
 
 <div class="page">
     <h1>MTÜ Lapikud</h1>
diff --git a/aboutus.html b/aboutus.html
index 85b4b08..a0f0392 100644
--- a/aboutus.html
+++ b/aboutus.html
@@ -2,6 +2,7 @@
 layout: default
 title: Lapikutest - Lapikud
 language: ee
+tag: aboutus
 ---
 
 {% include pages/aboutus.html %}
\ No newline at end of file
diff --git a/contact.html b/contact.html
index eba86c0..03dacfa 100644
--- a/contact.html
+++ b/contact.html
@@ -2,6 +2,7 @@
 layout: default
 title: Kontakt - Lapikud
 language: ee
-ref: contact
+tag: contact
 ---
+
 {% include pages/contact.html %}
diff --git a/en/aboutus.html b/en/aboutus.html
index 50bf10e..81c8e8c 100644
--- a/en/aboutus.html
+++ b/en/aboutus.html
@@ -2,6 +2,7 @@
 layout: default
 title: About us - Lapikud
 language: en
+tag: aboutus
 ---
 
 {% include pages/aboutus.html %}
\ No newline at end of file
diff --git a/en/contact.html b/en/contact.html
index 5d57614..37967d6 100644
--- a/en/contact.html
+++ b/en/contact.html
@@ -2,6 +2,7 @@
 layout: default
 title: Contact - Lapikud
 language: en
-ref: contact
+tag: contact
 ---
+
 {% include pages/contact.html %}
\ No newline at end of file
diff --git a/en/helpdesk.html b/en/helpdesk.html
index afaa689..186386d 100644
--- a/en/helpdesk.html
+++ b/en/helpdesk.html
@@ -2,5 +2,7 @@
 layout: default
 title: Helpdesk - Lapikud
 language: en
+tag: helpdesk
 ---
+
 {% include pages/helpdesk.html %}
\ No newline at end of file
diff --git a/en/history.html b/en/history.html
index c49d8ed..d3272ce 100644
--- a/en/history.html
+++ b/en/history.html
@@ -2,7 +2,9 @@
 layout: default
 title: History - Lapikud
 language: en
+tag: history
 ---
+
 {% include pages/history.html %}
 
 
diff --git a/en/index.html b/en/index.html
index 0c8e20b..8b89fc2 100644
--- a/en/index.html
+++ b/en/index.html
@@ -2,5 +2,7 @@
 layout: default
 title: Lapikud
 language: en
+tag: home
 ---
+
 {% include pages/index.html %}
\ No newline at end of file
diff --git a/en/members.html b/en/members.html
index c8cb9e8..e62f642 100644
--- a/en/members.html
+++ b/en/members.html
@@ -2,5 +2,7 @@
 layout: default
 title: Members - Lapikud
 language: en
+tag: members
 ---
+
 {% include pages/members.html %}
diff --git a/en/mentors.html b/en/mentors.html
index ac056c1..10bd129 100644
--- a/en/mentors.html
+++ b/en/mentors.html
@@ -2,5 +2,7 @@
 layout: default
 title: Mentors- Lapikud
 language: en
+tag: mentors
 ---
+
 {% include pages/mentors.html %}
diff --git a/en/ourwork.html b/en/ourwork.html
index 7d5892c..b201f49 100644
--- a/en/ourwork.html
+++ b/en/ourwork.html
@@ -2,5 +2,7 @@
 layout: default
 title: Previous works - Lapikud
 language: en
+tag: ourwork
 ---
+
 {% include pages/ourwork.html %}
\ No newline at end of file
diff --git a/en/student.html b/en/student.html
index db8e9eb..b00d20f 100644
--- a/en/student.html
+++ b/en/student.html
@@ -2,5 +2,7 @@
 layout: default
 title: For student - Lapikud
 language: en
+tag: student
 ---
+
 {% include pages/student.html %}
\ No newline at end of file
diff --git a/helpdesk.html b/helpdesk.html
index e89864d..c20a6b3 100644
--- a/helpdesk.html
+++ b/helpdesk.html
@@ -2,5 +2,7 @@
 layout: default
 title: Helpdesk - Lapikud
 language: ee
+tag: helpdesk
 ---
+
 {% include pages/helpdesk.html %}
\ No newline at end of file
diff --git a/history.html b/history.html
index 3fbf2d1..3bc548b 100644
--- a/history.html
+++ b/history.html
@@ -2,5 +2,7 @@
 layout: default
 title: Ajalugu - Lapikud
 language: ee
+tag: history
 ---
+
 {% include pages/history.html %}
\ No newline at end of file
diff --git a/index.html b/index.html
index e7941b6..c775135 100644
--- a/index.html
+++ b/index.html
@@ -2,6 +2,8 @@
 layout: default
 title: Lapikud
 language: ee
+tag: home
 ---
+
 {% include pages/index.html %}
 
diff --git a/members.html b/members.html
index 68531f6..c2b7a5f 100644
--- a/members.html
+++ b/members.html
@@ -2,5 +2,7 @@
 layout: default
 title: Liikmed - Lapikud
 language: ee
+tag: members
 ---
+
 {% include pages/members.html %}
diff --git a/mentors.html b/mentors.html
index 22a3133..19a172a 100644
--- a/mentors.html
+++ b/mentors.html
@@ -2,5 +2,7 @@
 layout: default
 title: Mentorid - Lapikud
 language: ee
+tag: mentors
 ---
+
 {% include pages/mentors.html%}
diff --git a/ourwork.html b/ourwork.html
index 6f38bd2..0c181bb 100644
--- a/ourwork.html
+++ b/ourwork.html
@@ -2,5 +2,7 @@
 layout: default
 title: Tehtud tööd - Lapikud
 language: ee
+tag: ourwork
 ---
+
 {% include pages/ourwork.html %}
\ No newline at end of file
diff --git a/student.html b/student.html
index 37293f2..7d5c8f3 100644
--- a/student.html
+++ b/student.html
@@ -2,5 +2,7 @@
 layout: default
 title: Tudengile - Lapikud
 language: ee
+tag: student
 ---
+
 {% include pages/student.html %}
\ No newline at end of file