diff --git a/bootstrapform/templates/bootstrapform/field.html b/bootstrapform/templates/bootstrapform/field.html
index 7791c28..cecb1b7 100644
--- a/bootstrapform/templates/bootstrapform/field.html
+++ b/bootstrapform/templates/bootstrapform/field.html
@@ -1,21 +1,37 @@
 {% load bootstrap %}
 <div class="control-group{% if field.errors %} error{% endif %}{% if field.field.required %} required{% endif %}">
     {% if field|is_checkbox %}
-                <div class="controls">
-                    <label class="checkbox">
-                        {{ field }} <span>{{ field.label }}</span>
-                    </label>
+        <div class="controls">
+            <label class="checkbox">
+                {{ field }} <span>{{ field.label }}</span>
+            </label>
 
-                    {% for error in field.errors %}
-                        <span class="help-inline">{{ error }}</span>
-                    {% endfor %}
+            {% for error in field.errors %}
+                <span class="help-inline">{{ error }}</span>
+            {% endfor %}
 
-                    {% if field.help_text %}
-                    <p class="help-block">
-                        {{ field.help_text|safe }}
-                    </p>
-                    {% endif %}
-                </div>
+            {% if field.help_text %}
+            <p class="help-block">
+                {{ field.help_text|safe }}
+            </p>
+            {% endif %}
+        </div>
+    {% else %}{% if field|is_radio %}
+        <div class="controls">
+            <label class="radio">
+                {{ field }} <span>{{ field.label }}</span>
+            </label>
+
+            {% for error in field.errors %}
+                <span class="help-inline">{{ error }}</span>
+            {% endfor %}
+
+            {% if field.help_text %}
+            <p class="help-block">
+                {{ field.help_text|safe }}
+            </p>
+            {% endif %}
+        </div>
     {% else %}
         <label class="control-label" for="{{ field.auto_id }}">{{ field.label }}</label>
 
@@ -33,5 +49,5 @@
             {% endif %}
 
         </div>
-    {% endif %}
+    {% endif %}{% endif %}
 </div>