diff --git a/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/bootstrap_fieldgroup.module b/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/bootstrap_fieldgroup.module
index db1c9d7..1ef336a 100644
--- a/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/bootstrap_fieldgroup.module
+++ b/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/bootstrap_fieldgroup.module
@@ -24,6 +24,10 @@ function bootstrap_fieldgroup_theme() {
       'template' => 'templates/bootstrap-fieldgroup-nav',
       'variables' => array('items' => array(), 'group' => NULL),
     ),
+    'bootstrap_fieldgroup_btn_group' => array(
+      'template' => 'templates/bootstrap-fieldgroup-btn-group',
+      'variables' => array('items' => array(), 'group' => NULL),
+    ),
   );
 }
 
@@ -45,6 +49,18 @@ function bootstrap_fieldgroup_field_group_formatter_info() {
     'instance_settings' => array('classes' => ''),
   );
 
+  $formatters['bootstrap_fieldgroup_btn_group'] = array(
+    'label' => t('Bootstrap button: group'),
+    'description' => t('This fieldgroup renders child groups as Bootstrap buttons'),
+    'instance_settings' => array('classes' => '', 'bootstrap_btn_size' => 0, 'bootstrap_btn_orientation' => 0),
+  );
+
+  $formatters['bootstrap_fieldgroup_btn_item'] = array(
+    'label' => t('Bootstrap button: item'),
+    'description' => t('This fieldgroup renders the content as a Bootstrap button'),
+    'instance_settings' => array('classes' => '', 'bootstrap_btn_style' => 'default'),
+  );
+
   foreach (array_keys($formatters) as $key) {
     $formatter = &$formatters[$key];
     $formatter['instance_settings']['required_fields'] = 1;
@@ -132,6 +148,61 @@ function bootstrap_fieldgroup_field_group_format_settings($group) {
 
       break;
 
+    case 'bootstrap_fieldgroup_btn_group':
+      $form['instance_settings']['bootstrap_btn'] = array(
+        '#tree' => TRUE,
+      );
+
+      $form['instance_settings']['bootstrap_btn_orientation'] = array(
+        '#title' => t('Orientation'),
+        '#type' => 'select',
+        '#options' => array(
+          'horizontal' => t('Horizontal'),
+          'vertical' => t('Vertical'),
+        ),
+        '#attributes' => array(
+          'class' => array('bootstrap-fieldgroup-btn-orientation'),
+        ),
+        '#default_value' => isset($group->format_settings['instance_settings']['bootstrap_btn_orientation']) ? $group->format_settings['instance_settings']['bootstrap_btn_orientation'] : $formatter['instance_settings']['bootstrap_btn_orientation'],
+        '#weight' => 1,
+      );
+
+      $form['instance_settings']['bootstrap_btn_size'] = array(
+        '#title' => t('Size of buttons'),
+        '#type' => 'select',
+        '#options' => array(
+          'default' => t('Default'),
+          'lg' => t('Large'),
+          'sm' => t('Small'),
+          'xs' => t('Smaller'),
+        ),
+        '#attributes' => array(
+          'class' => array('bootstrap-fieldgroup-btn-size'),
+        ),
+        '#default_value' => isset($group->format_settings['instance_settings']['bootstrap_btn_size']) ? $group->format_settings['instance_settings']['bootstrap_btn_size'] : $formatter['instance_settings']['bootstrap_btn_size'],
+        '#weight' => 1.5,
+      );
+
+      $form['instance_settings']['bootstrap_btn_style'] = array(
+        '#title' => t('Style of buttons'),
+        '#type' => 'select',
+        '#options' => array(
+          'default' => t('Default'),
+          'primary' => t('Primary'),
+          'success' => t('Success'),
+          'info' => t('Info'),
+          'warning' => t('Warning'),
+          'danger' => t('Danger'),
+        ),
+        '#attributes' => array(
+          'class' => array('bootstrap-fieldgroup-btn-style'),
+        ),
+        '#default_value' => isset($group->format_settings['instance_settings']['bootstrap_btn_style']) ? $group->format_settings['instance_settings']['bootstrap_btn_style'] : $formatter['instance_settings']['bootstrap_btn_style'],
+        '#weight' => 1.7,
+      );
+
+      break;
+
     default:
   }
 
@@ -144,8 +215,8 @@ function bootstrap_fieldgroup_field_group_format_settings($group) {
 function bootstrap_fieldgroup_field_group_pre_render(&$element, $group, &$form) {
 
   switch ($group->format_type) {
-
     case 'bootstrap_fieldgroup_nav':
+    case 'bootstrap_fieldgroup_btn_group':
 
       $element['#group'] = $group;
       $items = array();
@@ -162,6 +233,33 @@ function bootstrap_fieldgroup_field_group_pre_render(&$element, $group, &$form)
 
 /**
  * Implements field_group_pre_render_<format-type>.
+ * Format type: Bootstrap button: group.
+ */
+function field_group_pre_render_bootstrap_fieldgroup_btn_group(&$element, $group, &$form) {
+  $element += array(
+    '#type' => 'bootstrap_fieldgroup_btn_group',
+    '#theme' => 'bootstrap_fieldgroup_btn_group',
+    '#description' => $group->description,
+    '#parents' => array($group->parent_name),
+  );
+}
+
+/**
+ * Implements field_group_pre_render_<format-type>.
+ * Format type: Bootstrap button: item.
+ */
+function field_group_pre_render_bootstrap_fieldgroup_btn_item(&$element, $group, &$form) {
+  $element += array(
+    '#type' => 'bootstrap_fieldgroup_btn_item',
+    '#title' => check_plain($group->label),
+    '#description' => $group->description,
+    '#weight' => $group->weight,
+    '#parents' => array($group->parent_name),
+  );
+}
+
+/**
+ * Implements field_group_pre_render_<format-type>.
  * Format type: Bootstrap nav tabs/pills.
  */
 function field_group_pre_render_bootstrap_fieldgroup_nav(&$element, $group, &$form) {
@@ -191,6 +289,68 @@ function field_group_pre_render_bootstrap_fieldgroup_nav_item(&$element, $group,
  * Implements template_preprocess_bootstrap_tabs().
  * @param $variables
  */
+function template_preprocess_bootstrap_fieldgroup_btn_group(&$variables) {
+
+  $group = &$variables['group'];
+
+  $variables['wrapper_classes'] = $variables['group']->classes;
+  $variables['flip'] = FALSE;
+
+  $variables['btn_group_classes'] = 'btn-group';
+
+  if ($group->format_settings['instance_settings']['bootstrap_btn_orientation'] == 'vertical') {
+    $variables['btn_group_classes'] = 'btn-group-vertical';
+  }
+
+  // Add the size class if it's not the default size.
+  if ($group->format_settings['instance_settings']['bootstrap_btn_size'] != 'default') {
+    $variables['btn_group_classes'] = ' btn-group-' . $group->format_settings['instance_settings']['bootstrap_btn_size'];
+  }
+
+  // Apply this to each button item within the btn-group.
+  $variables['btn_style'] = 'btn-' . $group->format_settings['instance_settings']['bootstrap_btn_style'];
+
+  $variables['pane_classes'] = $variables['group']->classes;
+
+  uasort($variables['items'], 'element_sort');
+  foreach ($variables['items'] as $key => $item) {
+    // Check if item is not empty and we have access to it.
+    if ($item && (!isset($item['#access']) || $item['#access'])) {
+      $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['panes'][] = array(
+        'id' => $id,
+        'content' => drupal_render($item),
+      );
+    }
+
+  }
+
+  // Config?
+  $variables['active'] = 0;
+
+  if (count($variables['navs']) && count($variables['panes'])) {
+    $variables['is_empty'] = FALSE;
+  }
+}
+
+/**
+ * Implements template_preprocess_bootstrap_tabs().
+ * @param $variables
+ */
 function template_preprocess_bootstrap_fieldgroup_nav(&$variables) {
 
   $group = &$variables['group'];
diff --git a/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/templates/bootstrap-fieldgroup-btn-group.tpl.php b/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/templates/bootstrap-fieldgroup-btn-group.tpl.php
index fa4d3d0..3ce3d33 100644
--- a/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/templates/bootstrap-fieldgroup-btn-group.tpl.php
+++ b/docroot/sites/all/modules/contrib/bootstrap_fieldgroup/templates/bootstrap-fieldgroup-btn-group.tpl.php
@@ -20,19 +20,9 @@
 
   <div class="<?php print $wrapper_classes; ?>">
 
-    <?php if ($flip) : ?>
-      <div class="tab-content <?php print $pane_classes; ?>">
-        <?php foreach ($panes as $index => $pane) : ?>
-          <div id="<?php print $pane['id']; ?>" class="tab-pane <?php if ($index === $active) print 'active'; ?>">
-            <?php print $pane['content']; ?>
-          </div>
-        <?php endforeach; ?>
-      </div>
-    <?php endif; ?>
-
-    <ul class="nav <?php print $nav_classes; ?>">
+    <ul class="list-unstyled <?php print $btn_group_classes; ?>">
       <?php foreach ($navs as $index => $nav) : ?>
-        <li class="<?php if ($index === $active) print 'active'; ?>">
+        <li class="btn <?php print $btn_style; if ($index === $active) print ' active'; ?>">
           <?php print $nav; ?>
         </li>
       <?php endforeach; ?>