diff --git a/tbxforms/templates/tbx/layout/checkboxes.html b/tbxforms/templates/tbx/layout/checkboxes.html
index ad97497..eb7ca74 100644
--- a/tbxforms/templates/tbx/layout/checkboxes.html
+++ b/tbxforms/templates/tbx/layout/checkboxes.html
@@ -32,7 +32,7 @@
                     class="tbxforms-checkboxes__input"
                     id="id_{{ field.html_name }}_{{ forloop.counter }}"
                     value="{{ choice.0|unlocalize }}"
-                    {% if choice.0 in field.value or choice.0|stringformat:"s" in field.value or choice.0|stringformat:"s" == field.value|stringformat:"s" %}
+                    {% if choice.0 in field.value or choice.0|stringformat:"s" in field.value %}
                         checked="checked"
                     {% endif %}
                     {% if choice.hint %}
@@ -49,11 +49,11 @@
                         {{ choice.hint }}
                     </p>
                 {% endif %}
-
-                {% if choice.divider %}
-                    <div class="tbxforms-checkboxes__divider">{{ choice.divider }}</div>
-                {% endif %}
             </div>
+
+            {% if choice.divider %}
+                <div class="tbxforms-checkboxes__divider">{{ choice.divider }}</div>
+            {% endif %}
         {% endfor %}
     </div>
 
diff --git a/tbxforms/templates/tbx/layout/radios.html b/tbxforms/templates/tbx/layout/radios.html
index 37dd65d..28a127d 100644
--- a/tbxforms/templates/tbx/layout/radios.html
+++ b/tbxforms/templates/tbx/layout/radios.html
@@ -32,7 +32,7 @@
                     id="id_{{ field.html_name }}_{{ forloop.counter }}"
                     value="{{ choice.0|unlocalize }}"
 
-                    {% if choice.0 in field.value or choice.0|stringformat:"s" in field.value or choice.0|stringformat:"s" == field.value|stringformat:"s" %}
+                    {% if choice.0|stringformat:"s" == field.value|stringformat:"s" %}
                         checked="checked"
                     {% endif %}
 
@@ -51,11 +51,11 @@
                     </p>
                 {% endif %}
             </div>
-
-            {% if choice.divider %}
-                <div class="tbxforms-radios__divider">{{ choice.divider }}</div>
-            {% endif %}
         {% endfor %}
+
+        {% if choice.divider %}
+            <div class="tbxforms-radios__divider">{{ choice.divider }}</div>
+        {% endif %}
     </div>
 
 </fieldset>