diff --git a/theme/menu/menu-link.func.php b/theme/menu/menu-link.func.php
index 1fcb995..6930c5c 100644
--- a/theme/menu/menu-link.func.php
+++ b/theme/menu/menu-link.func.php
@@ -11,7 +11,7 @@ function bootstrap_menu_link(array $variables) {
   $element = $variables['element'];
   $sub_menu = '';
 
-  if ($element['#below']) {
+  if ($element['#below'] && $element['#original_link']['depth'] == 1) {
     // Prevent dropdown functions from being added to management menu so it
     // does not affect the navbar module.
     if (($element['#original_link']['menu_name'] == 'management') && (module_exists('navbar'))) {
@@ -21,24 +21,11 @@ function bootstrap_menu_link(array $variables) {
       // Add our own wrapper.
       unset($element['#below']['#theme_wrappers']);
       $sub_menu = '<ul class="dropdown-menu">' . drupal_render($element['#below']) . '</ul>';
+      $element['#attributes']['class'][] = 'dropdown';
+      $element['#title'] .= ' <span class="caret"></span>';
       $element['#localized_options']['attributes']['class'][] = 'dropdown-toggle';
       $element['#localized_options']['attributes']['data-toggle'] = 'dropdown';
-
-      // Check if this element is nested within another.
-      if ((!empty($element['#original_link']['depth'])) && ($element['#original_link']['depth'] > 1)) {
-        // Generate as dropdown submenu.
-        $element['#attributes']['class'][] = 'dropdown-submenu';
-      }
-      else {
-        // Generate as standard dropdown.
-        $element['#attributes']['class'][] = 'dropdown';
-        $element['#localized_options']['html'] = TRUE;
-        $element['#title'] .= ' <span class="caret"></span>';
-      }
-
-      // Set dropdown trigger element to # to prevent inadvertant page loading
-      // when a submenu link is clicked.
-      $element['#localized_options']['attributes']['data-target'] = '#';
+      $element['#localized_options']['html'] = TRUE;
     }
   }
   // On primary navigation menu, class 'active' is not set on active menu item.