diff --git a/examples/index.html b/examples/index.html
index 8b04bd5d..8f411249 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -579,15 +579,15 @@ <h2 class="span8 offset2">
             <div class="bs-docs-example">
                 <div class="control-group">
                      <div class="controls">
-                        <label class="control-label" for="option1">Option 1</label>
+                        <h5>Option 1</h5>
                         <div id="option1" class="make-switch radio1 radio-no-uncheck">
                             <input type="radio" name="radio1" value="option1">
                         </div>
-                        <label class="control-label" for="option2">Option 2</label>
+                        <h5>Option 2</h5>
                         <div id="option2" class="make-switch radio1 radio-no-uncheck">
                             <input type="radio" name="radio1" value="option2">
                         </div>
-                        <label class="control-label" for="option3">Option 3</label>
+                        <h5>Option 3</h5>
                         <div id="option3" class="make-switch radio1 radio-no-uncheck">
                             <input type="radio" name="radio1" value="option3">
                         </div>
@@ -597,15 +597,15 @@ <h2 class="span8 offset2">
             <pre class="prettyprint linenums">
 &lt;div class="control-group">
     &lt;div class="controls">
-        &lt;label class="control-label" for="option1">Option 1&lt;/label>
+        &lt;h5>Option 1&lt;/h5>
         &lt;div id="option1" class="make-switch radio1 radio-no-uncheck">
             &lt;input type="radio" name="radio1" value="option1">
         &lt;/div>
-        &lt;label class="control-label" for="option2">Option 2&lt;/label>
+        &lt;h5>Option 2&lt;/h5>
         &lt;div id="option2" class="make-switch radio1 radio-no-uncheck">
             &lt;input type="radio" name="radio1" value="option2">
         &lt;/div>
-        &lt;label class="control-label" for="option3">Option 3&lt;/label>
+        &lt;h5>Option 3&lt;/h5>
         &lt;div id="option3" class="make-switch radio1 radio-no-uncheck">
             &lt;input type="radio" name="radio1" value="option3">
         &lt;/div>
@@ -638,15 +638,15 @@ <h2 class="span8 offset2">
             <div class="bs-docs-example">
                 <div class="control-group">
                      <div class="controls">
-                        <label class="control-label" for="option1">Option 1</label>
+                        <h5>Option 1</h5>
                             <div id="option11" class="make-switch radio2">
                                 <input type="radio" name="radio2" value="option11">
                             </div>
-                        <label class="control-label" for="option12">Option 2</label>
+                        <h5>Option 2</h5>
                             <div id="option12" class="make-switch radio2">
                                 <input type="radio" name="radio2" value="option12" checked="checked">
                             </div>
-                        <label class="control-label" for="option13">Option 3</label>
+                        <h5>Option 3</h5>
                             <div id="option13" class="make-switch radio2">
                                 <input type="radio" name="radio2" value="option13">
                             </div>
@@ -656,15 +656,15 @@ <h2 class="span8 offset2">
             <pre class="prettyprint linenums">
 &lt;div class="control-group">
     &lt;div class="controls">
-        &lt;label class="control-label" for="option11">Option 1&lt;/label>
+        &lt;h5>Option 1&lt;/h5>
             &lt;div id="option11" class="make-switch radio2">
                 &lt;input type="radio" name="radio2" value="option1">
             &lt;/div>
-        &lt;label class="control-label" for="option12">Option 2&lt;/label>
+        &lt;h5>Option 2&lt;/h5>
             &lt;div id="option12" class="make-switch radio2">
                 &lt;input type="radio" name="radio2" value="option2" checked="checked">
             &lt;/div>
-        &lt;label class="control-label" for="option13">Option 3&lt;/label>
+        &lt;h5>Option 3&lt;/h5>
             &lt;div id="option13" class="make-switch radio2">
                 &lt;input type="radio" name="radio2" value="option3">
             &lt;/div>
@@ -923,4 +923,4 @@ <h3>Modal</h3>
       ga('send', 'pageview');
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/static/js/bootstrap-switch.js b/static/js/bootstrap-switch.js
index 80de245e..4396eb45 100644
--- a/static/js/bootstrap-switch.js
+++ b/static/js/bootstrap-switch.js
@@ -81,10 +81,6 @@
             if (icon) {
               $label.html('<i class="icon ' + icon + '"></i>');
             }
-            
-            if (textLabel) {
-              $label.html('' + textLabel + '');
-            }
 
             if (textLabel) {
               $label.html('' + textLabel + '');
diff --git a/static/js/bootstrap-switch.min.js b/static/js/bootstrap-switch.min.js
index 5a02168a..74d0c8a8 100644
--- a/static/js/bootstrap-switch.min.js
+++ b/static/js/bootstrap-switch.min.js
@@ -11,5 +11,4 @@
  * Licensed under the Apache License, Version 2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  * ============================================================ */
-
-!function($){"use strict";$.fn['bootstrapSwitch']=function(method){var inputSelector='input[type!="hidden"]';var methods={init:function(){return this.each(function(){var $element=$(this),$div,$switchLeft,$switchRight,$label,$form=$element.closest('form'),myClasses="",classes=$element.attr('class'),color,moving,onLabel="ON",offLabel="OFF",icon=false,textLabel=false;$.each(['switch-mini','switch-small','switch-large'],function(i,el){if(classes.indexOf(el)>=0)myClasses=el});$element.addClass('has-switch');if($element.data('on')!==undefined)color="switch-"+$element.data('on');if($element.data('on-label')!==undefined)onLabel=$element.data('on-label');if($element.data('off-label')!==undefined)offLabel=$element.data('off-label');if($element.data('label-icon')!==undefined)icon=$element.data('label-icon');if($element.data('text-label')!==undefined)textLabel=$element.data('text-label');$switchLeft=$('<span>').addClass("switch-left").addClass(myClasses).addClass(color).html(onLabel);color='';if($element.data('off')!==undefined)color="switch-"+$element.data('off');$switchRight=$('<span>').addClass("switch-right").addClass(myClasses).addClass(color).html(offLabel);$label=$('<label>').html("&nbsp;").addClass(myClasses).attr('for',$element.find(inputSelector).attr('id'));if(icon){$label.html('<i class="icon '+icon+'"></i>')}if(textLabel){$label.html(''+textLabel+'')}$div=$element.find(inputSelector).wrap($('<div>')).parent().data('animated',false);if($element.data('animated')!==false)$div.addClass('switch-animate').data('animated',true);$div.append($switchLeft).append($label).append($switchRight);$element.find('>div').addClass($element.find(inputSelector).is(':checked')?'switch-on':'switch-off');if($element.find(inputSelector).is(':disabled'))$(this).addClass('deactivate');var changeStatus=function($this){if($element.parent('label').is('.label-change-switch')){}else{$this.siblings('label').trigger('mousedown').trigger('mouseup').trigger('click')}};$element.on('keydown',function(e){if(e.keyCode===32){e.stopImmediatePropagation();e.preventDefault();changeStatus($(e.target).find('span:first'))}});$switchLeft.on('click',function(e){changeStatus($(this))});$switchRight.on('click',function(e){changeStatus($(this))});$element.find(inputSelector).on('change',function(e,skipOnChange){var $this=$(this),$element=$this.parent(),thisState=$this.is(':checked'),state=$element.is('.switch-off');e.preventDefault();$element.css('left','');if(state===thisState){if(thisState)$element.removeClass('switch-off').addClass('switch-on');else $element.removeClass('switch-on').addClass('switch-off');if($element.data('animated')!==false)$element.addClass("switch-animate");if(typeof skipOnChange==='boolean'&&skipOnChange)return;$element.parent().trigger('switch-change',{'el':$this,'value':thisState})}});$element.find('label').on('mousedown touchstart',function(e){var $this=$(this);moving=false;e.preventDefault();e.stopImmediatePropagation();$this.closest('div').removeClass('switch-animate');if($this.closest('.has-switch').is('.deactivate')){$this.unbind('click')}else if($this.closest('.switch-on').parent().is('.radio-no-uncheck')){$this.unbind('click')}else{$this.on('mousemove touchmove',function(e){var $element=$(this).closest('.make-switch'),relativeX=(e.pageX||e.originalEvent.targetTouches[0].pageX)-$element.offset().left,percent=(relativeX/$element.width())*100,left=25,right=75;moving=true;if(percent<left)percent=left;else if(percent>right)percent=right;$element.find('>div').css('left',(percent-right)+"%")});$this.on('click touchend',function(e){var $this=$(this),$target=$(e.target),$myRadioCheckBox=$target.siblings('input');e.stopImmediatePropagation();e.preventDefault();$this.unbind('mouseleave');if(moving)$myRadioCheckBox.prop('checked',!(parseInt($this.parent().css('left'))<-25));else $myRadioCheckBox.prop("checked",!$myRadioCheckBox.is(":checked"));moving=false;$myRadioCheckBox.trigger('change')});$this.on('mouseleave',function(e){var $this=$(this),$myInputBox=$this.siblings('input');e.preventDefault();e.stopImmediatePropagation();$this.unbind('mouseleave');$this.trigger('mouseup');$myInputBox.prop('checked',!(parseInt($this.parent().css('left'))<-25)).trigger('change')});$this.on('mouseup',function(e){e.stopImmediatePropagation();e.preventDefault();$(this).unbind('mousemove')})}});if($form.data('bootstrapSwitch')!=='injected'){$form.bind('reset',function(){setTimeout(function(){$form.find('.make-switch').each(function(){var $input=$(this).find(inputSelector);$input.prop('checked',$input.is(':checked')).trigger('change')})},1)});$form.data('bootstrapSwitch','injected')}})},toggleActivation:function(){var $this=$(this);$this.toggleClass('deactivate');$this.find(inputSelector).prop('disabled',$this.is('.deactivate'))},isActive:function(){return!$(this).hasClass('deactivate')},setActive:function(active){var $this=$(this);if(active){$this.removeClass('deactivate');$this.find(inputSelector).removeAttr('disabled')}else{$this.addClass('deactivate');$this.find(inputSelector).attr('disabled','disabled')}},toggleState:function(skipOnChange){var $input=$(this).find(':checkbox');$input.prop('checked',!$input.is(':checked')).trigger('change',skipOnChange)},toggleRadioState:function(skipOnChange){var $radioinput=$(this).find(':radio');$radioinput.not(':checked').prop('checked',!$radioinput.is(':checked')).trigger('change',skipOnChange)},toggleRadioStateAllowUncheck:function(uncheck,skipOnChange){var $radioinput=$(this).find(':radio');if(uncheck){$radioinput.not(':checked').trigger('change',skipOnChange)}else{$radioinput.not(':checked').prop('checked',!$radioinput.is(':checked')).trigger('change',skipOnChange)}},setState:function(value,skipOnChange){$(this).find(inputSelector).prop('checked',value).trigger('change',skipOnChange)},setOnLabel:function(value){var $switchLeft=$(this).find(".switch-left");$switchLeft.html(value)},setOffLabel:function(value){var $switchRight=$(this).find(".switch-right");$switchRight.html(value)},setOnClass:function(value){var $switchLeft=$(this).find(".switch-left");var color='';if(value!==undefined){if($(this).attr('data-on')!==undefined){color="switch-"+$(this).attr('data-on')}$switchLeft.removeClass(color);color="switch-"+value;$switchLeft.addClass(color)}},setOffClass:function(value){var $switchRight=$(this).find(".switch-right");var color='';if(value!==undefined){if($(this).attr('data-off')!==undefined){color="switch-"+$(this).attr('data-off')}$switchRight.removeClass(color);color="switch-"+value;$switchRight.addClass(color)}},setAnimated:function(value){var $element=$(this).find(inputSelector).parent();if(value===undefined)value=false;$element.data('animated',value);$element.attr('data-animated',value);if($element.data('animated')!==false){$element.addClass("switch-animate")}else{$element.removeClass("switch-animate")}},setSizeClass:function(value){var $element=$(this);var $switchLeft=$element.find(".switch-left");var $switchRight=$element.find(".switch-right");var $label=$element.find("label");$.each(['switch-mini','switch-small','switch-large'],function(i,el){if(el!==value){$switchLeft.removeClass(el);$switchRight.removeClass(el);$label.removeClass(el)}else{$switchLeft.addClass(el);$switchRight.addClass(el);$label.addClass(el)}})},status:function(){return $(this).find(inputSelector).is(':checked')},destroy:function(){var $element=$(this),$div=$element.find('div'),$form=$element.closest('form'),$inputbox;$div.find(':not(input)').remove();$inputbox=$div.children();$inputbox.unwrap().unwrap();$inputbox.unbind('change');if($form){$form.unbind('reset');$form.removeData('bootstrapSwitch')}return $inputbox}};if(methods[method])return methods[method].apply(this,Array.prototype.slice.call(arguments,1));else if(typeof method==='object'||!method)return methods.init.apply(this,arguments);else $.error('Method '+method+' does not exist!')}}(jQuery);(function($){$(function(){$('.make-switch')['bootstrapSwitch']()})})(jQuery);
+!function($){"use strict";$.fn['bootstrapSwitch']=function(method){var inputSelector='input[type!="hidden"]';var methods={init:function(){return this.each(function(){var $element=$(this),$div,$switchLeft,$switchRight,$label,$form=$element.closest('form'),myClasses="",classes=$element.attr('class'),color,moving,onLabel="ON",offLabel="OFF",icon=false,textLabel=false;$.each(['switch-mini','switch-small','switch-large'],function(i,el){if(classes.indexOf(el)>=0)myClasses=el});$element.addClass('has-switch');if($element.data('on')!==undefined)color="switch-"+$element.data('on');if($element.data('on-label')!==undefined)onLabel=$element.data('on-label');if($element.data('off-label')!==undefined)offLabel=$element.data('off-label');if($element.data('label-icon')!==undefined)icon=$element.data('label-icon');if($element.data('text-label')!==undefined)textLabel=$element.data('text-label');$switchLeft=$('<span>').addClass("switch-left").addClass(myClasses).addClass(color).html(onLabel);color='';if($element.data('off')!==undefined)color="switch-"+$element.data('off');$switchRight=$('<span>').addClass("switch-right").addClass(myClasses).addClass(color).html(offLabel);$label=$('<label>').html("&nbsp;").addClass(myClasses).attr('for',$element.find(inputSelector).attr('id'));if(icon){$label.html('<i class="icon '+icon+'"></i>')}if(textLabel){$label.html(''+textLabel+'')}$div=$element.find(inputSelector).wrap($('<div>')).parent().data('animated',false);if($element.data('animated')!==false)$div.addClass('switch-animate').data('animated',true);$div.append($switchLeft).append($label).append($switchRight);$element.find('>div').addClass($element.find(inputSelector).is(':checked')?'switch-on':'switch-off');if($element.find(inputSelector).is(':disabled'))$(this).addClass('deactivate');var changeStatus=function($this){if($element.parent('label').is('.label-change-switch')){}else{$this.siblings('label').trigger('mousedown').trigger('mouseup').trigger('click')}};$element.on('keydown',function(e){if(e.keyCode===32){e.stopImmediatePropagation();e.preventDefault();changeStatus($(e.target).find('span:first'))}});$switchLeft.on('click',function(e){changeStatus($(this))});$switchRight.on('click',function(e){changeStatus($(this))});