diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index cb12c9d32..9e2960f5b 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2537,7 +2537,7 @@ class e_form
 		}
 
 		$pre = (vartrue($options['label'])) ? "<label class='".$labelClass.$active."'{$labelTitle}>" : ""; // Bootstrap compatible markup
-		$post = (vartrue($options['label'])) ? $options['label']."</label>" : "";
+		$post = (vartrue($options['label'])) ? "<span>".$options['label']."</span></label>" : "";
 		unset($options['label']); // not to be used as attribute; 
 		
 		$text .= "<input type='checkbox' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
@@ -2559,7 +2559,7 @@ class e_form
 
 		if(!is_array($checked)) $checked = explode(",",$checked);
 		
-		$text = "";
+		$text = array();
 
 		$cname = $name;
 
@@ -2588,14 +2588,21 @@ class e_form
 			 * and also failed in case it contained a "=" character
 			 */
 			$options['label'] = $label;
-			$text .= $this->checkbox($cname, $key, $c, $options);
+			$text[] = $this->checkbox($cname, $key, $c, $options);
 		}
 
+		$id = empty($options['id']) ? $this->name2id($name).'-container' : $options['id'];
+
 	//	return print_a($checked,true);
+		if($options['list'])
+		{
+			return "<ul id='".$id."' class='checkboxes'><li>".implode("</li><li>",$text)."</li></ul>";
+		}
+
 
 		if(!empty($text))
 		{
-			return "<div class='checkboxes' style='display:inline-block'>".$text."</div>";
+			return "<div id='".$id."' class='checkboxes' style='display:inline-block'>".implode("",$text)."</div>";
 		}
 
 		return $text;
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index bd5f1a672..296eeed20 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -177,6 +177,7 @@ input.input-block-level,
 input.form-control.input-block-level,
 select.input-block-level                { width: 100% }
 table  label.checkbox                   { margin-left: 20px }
+ul.checkboxes { display: inline-block; list-style: none; margin: 0; padding: 0;}
 
 #admin-ui-nav-menu i.fa-chevron-right   { margin-left: -10px }
 
diff --git a/e107_web/css/e107.css b/e107_web/css/e107.css
index 07a590d03..42aaa6ca0 100644
--- a/e107_web/css/e107.css
+++ b/e107_web/css/e107.css
@@ -191,7 +191,7 @@ div.bbcode { margin: 15px 0px; clear: both; } /* layout control via bbcodes */
 
 .e-instant-edit { font-size: 10pt; position: absolute; right: 10px; text-align: right; display: inline-block; z-index:1000; margin-right:10px;	}
 
-
+ul.checkboxes { display: inline-block; list-style: none; margin: 0; padding: 0;}