diff --git a/babyblotter/templates/babyblotter/form.html b/babyblotter/templates/babyblotter/form.html
index d21a0294..25dd5dfd 100644
--- a/babyblotter/templates/babyblotter/form.html
+++ b/babyblotter/templates/babyblotter/form.html
@@ -1,22 +1,43 @@
 {% load widget_tweaks %}
 
-<form role="form" method="post">
-    {% csrf_token %}
-    {% for field in form %}
-        <div class="form-group">
-            <label for="id_{{ field.name }}">{{ field.label }}</label>
-            {% if field.errors %}
-                {{ field|add_class:"form-control is-invalid" }}
-            {% else %}
-                {{ field|add_class:"form-control" }}
-            {% endif %}
-            {% if field.help_text %}
-                <p class="help-block"><small>{{ field.help_text }}</small></p>
-            {% endif %}
-            {% if field.errors %}
-                <p class="invalid-feedback">{% for error in  field.errors %}{{ error }}{% endfor %}</p>
-            {% endif %}
-        </div>
-    {% endfor %}
-    <button type="submit" class="btn btn-primary">Submit</button>
-</form>
\ No newline at end of file
+<div class="container-fluid">
+    <form role="form" method="post">
+        {% csrf_token %}
+        {% for field in form %}
+            <div class="d-none">{{ field|field_type }}</div>
+            <div class="form-group row">
+                {% if field|field_type == 'booleanfield' %}
+                    <div class="col-sm-1">&nbsp;</div>
+                    <div class="col-sm-11">
+                        <div class="form-check">
+                            <label for="id_{{ field.name }}" class="form-check-label">
+                                {% if field.errors %}
+                                    {{ field|add_class:'form-check-input is-invalid' }}
+                                {% else %}
+                                    {{ field|add_class:'form-check-input' }}
+                                {% endif %}
+                                {{ field.label }}
+                            </label>
+                        </div>
+                    </div>
+                {% else %}
+                    <label for="id_{{ field.name }}" class="col-sm-1 col-form-label">{{ field.label }}</label>
+                    <div class="col-sm-11">
+                        {% if field.errors %}
+                            {{ field|add_class:'form-control is-invalid' }}
+                        {% else %}
+                            {{ field|add_class:'form-control' }}
+                        {% endif %}
+                    </div>
+                {% endif %}
+                {% if field.help_text %}
+                    <p class="help-block"><small>{{ field.help_text }}</small></p>
+                {% endif %}
+                {% if field.errors %}
+                    <p class="invalid-feedback">{% for error in  field.errors %}{{ error }}{% endfor %}</p>
+                {% endif %}
+            </div>
+        {% endfor %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+    </form>
+</div>
\ No newline at end of file