diff --git a/_data/footer-links.yml b/_data/footer-links.yml
new file mode 100644
index 00000000000..e48593d2687
--- /dev/null
+++ b/_data/footer-links.yml
@@ -0,0 +1,21 @@
+- label: Become a Contributor
+  url: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
+
+- label: Glossary
+  url: https://magento.github.io/glossary/index.html?audience=developer
+
+- label: Privacy Policy
+  url: https://magento.com/legal/terms/privacy/
+
+- label: Terms of Service
+  url: https://magento.com/legal/terms/
+
+- label: License/Trademark FAQ
+  url: https://magento.com/legal/licensing/
+
+- label: Release Notes
+  url: /release-notes/bk-release-notes.html
+
+- label: Third-Party Licenses
+  url: /magento-third-party.html
+  versionless: true
diff --git a/_includes/layout/footer-links.html b/_includes/layout/footer-links.html
index b8347571764..026b60db3d7 100644
--- a/_includes/layout/footer-links.html
+++ b/_includes/layout/footer-links.html
@@ -1,19 +1,7 @@
+{% assign items = site.data.footer-links %}
+
 <ul class="nav footer-links">
-  <li><a href="https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md">Become a Contributor</a>
-  <li><a href="https://magento.github.io/glossary/index.html?audience=developer">Glossary</a></li>
-  <li><a href="http://magento.com/legal/terms/privacy/">Privacy Policy</a></li>
-  <li><a href="http://magento.com/legal/terms/">Terms of Service</a></li>
-  <li><a href="http://magento.com/legal/licensing/">License/Trademark FAQ</a></li>
-  <!-- If the page is in the root, the link points to the default version of release notes.
-       The default version is set in the config.yaml.
-    {%- capture release-notes -%}
-      {%- unless page.baseurl == empty -%}
-        {{page.baseurl}}/release-notes/bk-release-notes.html
-      {%- else -%}
-        /guides/v{{ site.version }}/release-notes/bk-release-notes.html
-      {%- endunless -%}
-    {%- endcapture -%}
-    -->
-  <li><a href="{{release-notes}}">Release Notes</a></li>
-  <li><a href="{{ site.baseurl }}/magento-third-party.html">Third-Party Licenses</a></li>
+{% for item in items %}
+  {% include layout/nav-item.html section=item %}
+{% endfor %}
 </ul>
diff --git a/_includes/layout/toc-entry.html b/_includes/layout/nav-item.html
similarity index 83%
rename from _includes/layout/toc-entry.html
rename to _includes/layout/nav-item.html
index f57a1c66119..e30668b6e5f 100644
--- a/_includes/layout/toc-entry.html
+++ b/_includes/layout/nav-item.html
@@ -26,17 +26,16 @@
   {% assign compare_url = page.url | prepend: site.baseurl %}
 <li class="{% if compare_url == item_url %}active{% endif %} {{ item.class }}">
   {% if item.url %}
-    <a href="{{ item_url }}">{{ item.label }}</a>
+  <a href="{{ item_url }}">{{ item.label }}</a>
   {% else %}
-    <span>{{ item.label }}</span>
+  <span>{{ item.label }}</span>
   {% endif %}
-
   {% if children %}
-    <ul>
-      {% for child in children %}
-         {% include layout/toc-entry.html section=child %}
-      {% endfor %}
-    </ul>
+  <ul>
+    {% for child in children %}
+      {% include layout/nav-item.html section=child %}
+    {% endfor %}
+  </ul>
   {% endif %}
 </li>
 {% endif %}
diff --git a/_includes/layout/navigation.html b/_includes/layout/navigation.html
index 5a853b7c6cd..941fc52df76 100644
--- a/_includes/layout/navigation.html
+++ b/_includes/layout/navigation.html
@@ -21,12 +21,12 @@
               <div class="nav-section-title">{{ subsection.label }}</div>
               <ul>
               {% for item in subchildren %}
-                {% include layout/main-nav-item.html item=item %}
+                {% include layout/nav-item.html section=item %}
               {% endfor%}
               </ul>
             </div>
           {% else if %}
-            {% include layout/main-nav-item.html item=subsection %}
+            {% include layout/nav-item.html section=subsection %}
           {% endif %}
         {% endfor %}
       {% endcapture %}
@@ -47,4 +47,4 @@
 
 {% endfor %}
 
-</ul><!-- /.nav-main -->
\ No newline at end of file
+</ul><!-- /.nav-main -->
diff --git a/_includes/layout/sidebar.html b/_includes/layout/sidebar.html
index a1586b80848..9286f56dbed 100644
--- a/_includes/layout/sidebar.html
+++ b/_includes/layout/sidebar.html
@@ -4,12 +4,12 @@
 	<div class="sidebar-wrapper">
 
 		{% assign toc = site.data.toc[page.group] %}
-		
+
 		<h4 class="guide-title">{{ toc.label }}</h4>
 		<div class="collapsible-navigation">
 		    <ul>
 		    {% for entry in toc.pages %}
-		    	{% include layout/toc-entry.html section=entry %}
+		    	{% include layout/nav-item.html section=entry %}
 		    {% endfor %}
 		    </ul>
 		</div>
@@ -17,4 +17,4 @@ <h4 class="guide-title">{{ toc.label }}</h4>
 	</div>
 
 </aside>
-<!-- /sidebar -->
\ No newline at end of file
+<!-- /sidebar -->