diff --git a/pages/_includes/layout/menu.html b/pages/_includes/layout/menu.html
index 8ff193384..64803dce8 100644
--- a/pages/_includes/layout/menu.html
+++ b/pages/_includes/layout/menu.html
@@ -11,15 +11,8 @@
 			<span class="nav-icon">
 				{% include ui/icon.html icon=icon  %}
 			</span>
-			<span class="nav-text">
-				{{ level-1[1].title }}
 
-				{% unless include.top %}
-				{% if level-1[1].label %}
-				<span class="badge bg-{{ level-1[1].label-color | default: 'primary' }} text-white ml-auto">{{ level-1[1].label }}</span>
-				{% endif %}
-				{% endunless %}
-			</span>
+			{{ level-1[1].title }}
 		</a>
 
 		{% if level-1[1].children %}
@@ -27,12 +20,13 @@
 			{% for level-2 in level-1[1].children %}
 			<li {% if level-2[1].children %}class="dropright"{% endif %}>
 				<a class="dropdown-item{% if level-2[1].children %} dropdown-toggle{% endif %}{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] and current-page.size == 2 %} active{% endif %}" {% if level-2[1].children %}href="#sidebar-{{ level-2[0] }}" data-toggle="dropdown" role="button" aria-expanded="false" {% else %}href="{{ site.base }}/{{ level-2[1].url }}" {% endif %}>
-					<span class="nav-text">
-						{{ level-2[1].title }}
-						{% if level-2[1].label %}
-							<span class="badge bg-{{ level-2[1].label-color | default: 'primary' }} text-white ml-auto">{{ level-2[1].label }}</span>
-						{% endif %}
-					</span>
+					{{ level-2[1].title }}
+
+					{% if level-2[1].badge %}
+					{% assign badge = level-2[1].badge %}
+					{% assign badge-color = level-2[1].badge-color | default: 'green' %}
+					{% include ui/badge.html text=badge color=badge-color class="ml-auto" %}
+					{% endif %}
 				</a>
 
 				{% if level-2[1].children %}