diff --git a/menu/templates/bootstrap-navbar-submenu.html b/menu/templates/bootstrap-navbar-submenu.html
index cd33482..dace833 100644
--- a/menu/templates/bootstrap-navbar-submenu.html
+++ b/menu/templates/bootstrap-navbar-submenu.html
@@ -1,14 +1,13 @@
-<ul class="dropdown-menu">
+<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
     {% for item in items %}
         {% if item.visible %}
-            <li class="{% if item.selected %} active{% endif %}{% if item.children %} dropdown-submenu{% endif %}">
-                <a href="{{ item.url }}">{{ item.title }}</a>
+            <a class="dropdown-item {% if item.selected %} active{% endif %}{% if item.children %} dropdown-submenu{% endif %}" href="{{ item.url }}">{{ item.title }}
                 {% if item.children %}
                     {% with items=item.children template_name='bootstrap-navbar-submenu.html' %}
                        {% include template_name %}
                     {% endwith %}
                 {% endif %}
-            </li>
+            </a>
         {% endif %}
     {% endfor %}
-</ul>
+</div>
diff --git a/menu/templates/bootstrap-navbar.html b/menu/templates/bootstrap-navbar.html
index e40af91..9b46b10 100644
--- a/menu/templates/bootstrap-navbar.html
+++ b/menu/templates/bootstrap-navbar.html
@@ -4,8 +4,8 @@
             <li class="divider-vertical"></li>
         {% endif %}
 
-        <li class="{% if item.selected %} active{% endif %}{% if item.children %} dropdown{% endif %}" id="top-menu-{{ item.slug }}">
-            <a href="{{ item.url }}"{% if item.children %} class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"{% endif %}>
+        <li class="nav-item {% if item.selected %} active{% endif %}{% if item.children %} dropdown{% endif %}" id="top-menu-{{ item.slug }}">
+            <a href="{{ item.url }}" {% if not item.children %}class=nav-link {% endif%} {% if item.children %} class="nav-link dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"{% endif %}>
                 {% if item.icon %}
                     <i class="icon-{{ item.icon }} icon-white"></i>&nbsp;
                 {% endif %}