diff --git a/app/assets/javascripts/app/views/generic/checkbox.jst.eco b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
index 8c3eca81c..a9577fff7 100644
--- a/app/assets/javascripts/app/views/generic/checkbox.jst.eco
+++ b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
@@ -1,5 +1,5 @@
-<div class="<%= @attribute.class %>">
+<div class="<%= @attribute.class %> checkbox">
 <% for row in @attribute.options: %>
-    <input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %><br/>
+    <label><input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %></label>
 <% end %>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/radio.jst.eco b/app/assets/javascripts/app/views/generic/radio.jst.eco
index 9466024a4..b7fec4300 100644
--- a/app/assets/javascripts/app/views/generic/radio.jst.eco
+++ b/app/assets/javascripts/app/views/generic/radio.jst.eco
@@ -1,5 +1,5 @@
 <div class="<%= @attribute.class %>">
 <% for row in @attribute.options: %>
-    <input type="radio" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %><br/>
+    <label><input type="radio" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %></label>
 <% end %>
 </div>
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css
index 175e3ecf5..d3e9a7407 100644
--- a/app/assets/stylesheets/zzz.css
+++ b/app/assets/stylesheets/zzz.css
@@ -434,6 +434,12 @@ h5 {
   width: 130px;
   margin-top: 7px;
 }
+.form-horizontal .form-group .checkbox label {
+  text-align: left;
+  width: 100%;
+  margin-top: 0;
+  margin-bottom: 4px;
+}
 
 /*
  * bootstrap changes