diff --git a/bootstrapform/meta.py b/bootstrapform/meta.py
index f1028b4..23624a1 100644
--- a/bootstrapform/meta.py
+++ b/bootstrapform/meta.py
@@ -1,5 +1,5 @@
 from distutils.version import StrictVersion
 
 
-VERSION = StrictVersion('0.2.0')
+VERSION = StrictVersion('2.0.1')
 
diff --git a/bootstrapform/templates/bootstrapform/form.html b/bootstrapform/templates/bootstrapform/form.html
index 7e3ad47..fb3d802 100644
--- a/bootstrapform/templates/bootstrapform/form.html
+++ b/bootstrapform/templates/bootstrapform/form.html
@@ -7,12 +7,10 @@
 {% endfor %}
 
 {% for field in form.visible_fields %}
-    <div class="clearfix{% if field.errors %} error{% endif %}">
+    <div class="control-group{% if field.errors %} error{% endif %}">
         {% if field|is_checkbox %}
-            <ul class="inputs-list">
-                <li>
-                    <div class="input">
-                        <label>
+                    <div class="controls">
+                        <label class="checkbox">
                             {{ field }} <span>{{ field.label }}</span>
                         </label>
 
@@ -21,16 +19,15 @@
                         {% endfor %}
 
                         {% if field.help_text %}
-                        <span class="help-block">
+                        <p class="help-block">
                             {{ field.help_text }}
-                        </span>
+                        </p>
                         {% endif %}
                     </div>
-                </li>
-            </ul>
         {% else %}
-            {{ field.label_tag }}
-            <div class="input">
+            <div class="control-label">{{ field.label }}</div>
+
+            <div class="controls">
                 {{ field }}
 
                 {% for error in field.errors %}
@@ -38,9 +35,9 @@
                 {% endfor %}
 
                 {% if field.help_text %}
-                <span class="help-block">
+                <p class="help-block">
                     {{ field.help_text }}
-                </span>
+                </p>
                 {% endif %}
 
             </div>
diff --git a/bootstrapform/templatetags/bootstrap.py b/bootstrapform/templatetags/bootstrap.py
index d7af1be..b9ded19 100644
--- a/bootstrapform/templatetags/bootstrap.py
+++ b/bootstrapform/templatetags/bootstrap.py
@@ -13,3 +13,8 @@ def bootstrap(form):
 @register.filter
 def is_checkbox(field):
     return field.field.widget.__class__.__name__.lower() == "checkboxinput"
+
+
+@register.filter
+def is_radio(field):
+    return field.field.widget.__class__.__name__.lower() == "radioselect"