diff --git a/hypha/apply/templates/forms/includes/field.html b/hypha/apply/templates/forms/includes/field.html
index b0dbf0c81795f1e8a525e28d795684257afdf6bb..5b5e3cdfa6c4e8fb4851d1bbd22ea2ec766007c9 100644
--- a/hypha/apply/templates/forms/includes/field.html
+++ b/hypha/apply/templates/forms/includes/field.html
@@ -10,6 +10,14 @@
                 <span class="form__required">*</span>
             {% endif %}
         </label>
+    {% elif widget_type == 'checkbox_select_multiple' or widget_type == 'radio_select' %}
+        <fieldset>
+            <legend class="form__question form__question--{{ field_type }} {{ widget_type }}" {% if field.field.required %}required{% endif %}>
+                <span>{{ field.label }}</span>
+                {% if field.field.required %}
+                    <span class="form__required">*</span>
+                {% endif %}
+            </legend>
     {% else %}
         <label for="{{ field.id_for_label }}" class="form__question form__question--{{ field_type }} {{ widget_type }}" {% if field.field.required %}required{% endif %}>
             <span>{{ field.label }}</span>
@@ -47,5 +55,8 @@
             </div>
         {% endif %}
     </div>
+    {% if widget_type == 'checkbox_select_multiple' or widget_type == 'radio_select' %}
+        </fieldset>
+    {% endif %}
 </div>
 {% endwith %}
diff --git a/hypha/static_src/src/sass/public/components/_link.scss b/hypha/static_src/src/sass/public/components/_link.scss
index 113be555b4cabb00d6e15ccb675b57e73f6572c8..a0170037ac9715ed02cb1269ef4b08dab702810d 100644
--- a/hypha/static_src/src/sass/public/components/_link.scss
+++ b/hypha/static_src/src/sass/public/components/_link.scss
@@ -6,7 +6,7 @@
     }
 
     &--button {
-        @include button($color--light-blue, $color--dark-blue);
+        @include button($color--light-blue, $color--darkest-blue);
         display: inline-block;
 
         &--narrow {