diff --git a/media/commitfest/css/commitfest.css b/media/commitfest/css/commitfest.css
index 6440808c..f88f54cf 100644
--- a/media/commitfest/css/commitfest.css
+++ b/media/commitfest/css/commitfest.css
@@ -39,15 +39,6 @@ div.form-group div.controls ul li label input {
     display: inline;
     vertical-align: middle;
 }
-div.form-group div.controls input[type="checkbox"] {
-    width: 10px;
-    height: unset;
-    display: inline-block;
-}
-div.form-group div.controls > div.form-control:has(input[type="checkbox"]) {
-    display: flex;
-    gap: 8px;
-}
 
 div.form-group div.controls input.threadpick-input {
     width: 80%;
diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index 12128c14..a511e6c0 100644
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -15,14 +15,21 @@
   {%for field in form%}
    {%if not field.is_hidden%}
     <div class="form-group">
-     {{field|label_class:"control-label col-lg-1"}}
-     <div class="col-lg-11 controls">
+     {{field|label_class:"control-label"}}
+     <div class="col-lg-12 controls">
       {%if field.errors %}
        {%for e in field.errors%}
         <div class="alert alert-danger">{{e}}</div>
        {%endfor%}
       {%endif%}
-      {%if not field.name in form.selectize_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
+      {%if field.name|slice:":7" == 'review_' %}
+       {%for choice in field %}
+        <div class="form-check form-check-inline">
+         <input type="checkbox" class="form-check-input" name="{{field.name}}" value="{{choice.data.value}}" id="{{choice.id_for_label}}" {% if choice.data.selected %}checked{% endif %}>
+         <label class="form-check-label" for="{{choice.id_for_label}}">{{choice.choice_label}}</label>
+        </div>
+       {%endfor%}
+      {%elif not field.name in form.selectize_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
       {%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
     </div>
    {%else%}
@@ -31,7 +38,7 @@
   {%endfor%}
   <div class="form-group">
    <div class="col-lg-12">
-    <div class="control"><input type="submit" class="btn btn-primary" value="{{savebutton|default:"Save"}}"></div>
+    <input type="submit" class="btn btn-primary" value="{{savebutton|default:"Save"}}">
    </div>
   </div>
  </form>