diff --git a/bootstrap_fieldgroup.js b/bootstrap_fieldgroup.js
index 0ca47b4..9da2755 100644
--- a/bootstrap_fieldgroup.js
+++ b/bootstrap_fieldgroup.js
@@ -31,4 +31,35 @@ Drupal.behaviors.BootstrapFieldgroup = {
   }
 };
 
+/**
+ * Implements Drupal.FieldGroup.processHook().
+ */
+Drupal.FieldGroup = Drupal.FieldGroup || {};
+Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
+Drupal.FieldGroup.Effects.processBootstrap_Fieldgroup_Nav = {
+  execute: function (context, settings, type) {
+    
+    if (type == 'form') {
+      
+      // Add required fields mark to any element containing required fields
+      $('ul.nav', context).once('fieldgroup-effects', function(i) {
+        
+        $('li', this).each(function() {
+          
+          if ($(this).is('.required-fields')) {
+            
+            var $link = $('a', this);
+            var $group = $(this).closest('.bootstrap-nav-wrapper');
+            var $pane = $('.tab-content', $group).find($link.attr('href'));
+            if ($pane.find('.form-required').length > 0) {
+              $link.append(' ').append($('.form-required').eq(0).clone());
+            }
+          }
+        });
+      });
+    }
+  }
+};
+
+
 })(jQuery);
\ No newline at end of file
diff --git a/bootstrap_fieldgroup.module b/bootstrap_fieldgroup.module
index 6fba659..78baec1 100644
--- a/bootstrap_fieldgroup.module
+++ b/bootstrap_fieldgroup.module
@@ -143,11 +143,12 @@ function bootstrap_fieldgroup_field_group_format_settings($group) {
  */
 function bootstrap_fieldgroup_field_group_pre_render(&$element, $group, &$form) {
 
+  $element['#group'] = $group;
+
   switch ($group->format_type) {
 
     case 'bootstrap_fieldgroup_nav':
 
-      $element['#group'] = $group;
       $items = array();
       foreach ($group->children as $group_name) {
         $items[$group_name] = &$element[$group_name];
@@ -170,6 +171,9 @@ function field_group_pre_render_bootstrap_fieldgroup_nav(&$element, $group, &$fo
     '#theme' => 'bootstrap_fieldgroup_nav',
     '#description' => $group->description,
     '#parents' => array($group->parent_name),
+    '#attached' => array(
+      'js' => array(drupal_get_path('module', 'bootstrap_fieldgroup') . '/bootstrap_fieldgroup.js'),
+    ),
   );
 }
 
@@ -196,6 +200,7 @@ function template_preprocess_bootstrap_fieldgroup_nav(&$variables) {
   $group = &$variables['group'];
 
   $variables['wrapper_classes'] = $variables['group']->classes;
+  $variables['wrapper_classes'] .= ' bootstrap-nav-wrapper';
 
   $variables['flip'] = FALSE;
 
@@ -238,17 +243,20 @@ function template_preprocess_bootstrap_fieldgroup_nav(&$variables) {
 
     $id = _bootstrap_fieldgroup_label_to_id($item['#title']);
 
-    $variables['navs'][] = l(
-      $item['#title'],
-      NULL,
-      array(
-        'attributes' => array(
-          'data-toggle' => 'tab'
-        ),
-        'fragment' => $id,
-        'external' => TRUE,
-        'html' => TRUE,
-      )
+    $variables['navs'][] = array(
+      'content' => l(
+        $item['#title'],
+        NULL,
+        array(
+          'attributes' => array(
+            'data-toggle' => 'tab'
+          ),
+          'fragment' => $id,
+          'external' => TRUE,
+          'html' => TRUE,
+        )
+      ),
+      'classes' => $item['#group']->classes,
     );
 
     $variables['panes'][] = array(
diff --git a/templates/bootstrap-fieldgroup-nav.tpl.php b/templates/bootstrap-fieldgroup-nav.tpl.php
index fa4d3d0..7d0c56e 100644
--- a/templates/bootstrap-fieldgroup-nav.tpl.php
+++ b/templates/bootstrap-fieldgroup-nav.tpl.php
@@ -32,8 +32,8 @@
 
     <ul class="nav <?php print $nav_classes; ?>">
       <?php foreach ($navs as $index => $nav) : ?>
-        <li class="<?php if ($index === $active) print 'active'; ?>">
-          <?php print $nav; ?>
+        <li class="<?php print $nav['classes']; ?><?php if ($index === $active) print 'active'; ?>">
+          <?php print $nav['content']; ?>
         </li>
       <?php endforeach; ?>
     </ul>