diff --git a/assets/css/app.css b/assets/css/app.css
index bb5e251..93510fe 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -158,6 +158,7 @@ label {
 
 input[type="checkbox"] {
     border: 1px solid #ccc;
+    margin-right: 0.5em;
 }
 
 input[type="email"],
diff --git a/lib/helpers.php b/lib/helpers.php
index 5365a7d..756fee9 100644
--- a/lib/helpers.php
+++ b/lib/helpers.php
@@ -245,7 +245,7 @@ function form_radio($name, $label, $value, $checked = false, $class = '')
 
 function form_checkbox($name, $label, $value, $checked = false, $class = '')
 {
-    return '<label><input type="checkbox" name="'.$name.'" class="'.$class.'" value="'.escape($value).'" '.($checked ? 'checked="checked"' : '').'>&nbsp;'.escape($label).'</label>';
+    return '<label><input type="checkbox" name="'.$name.'" class="'.$class.'" value="'.escape($value).'" '.($checked ? 'checked="checked"' : '').'><span>'.escape($label).'</span></label>';
 }
 
 function form_label($label, $name, $class = '')