diff --git a/templates/question-checkbox.html b/templates/question-checkbox.html
index b86ce5c..f652818 100644
--- a/templates/question-checkbox.html
+++ b/templates/question-checkbox.html
@@ -7,9 +7,10 @@
     {% for n,opt in enumerate(question['options']) %}
             <a class="list-group-item">
                 <input type="checkbox" id="{{ n }}" name="answer" value="{{ n }}">
-                {{ opt }}
+                <label for="{{ n }}">{{ md(opt) }}</label>
             </a>
     {% end %}
     </div>
 </fieldset>
+<input type="hidden" name="question_ref" value="{{ question['ref'] }}">
 {% end %}
\ No newline at end of file
diff --git a/templates/question-radio.html b/templates/question-radio.html
index 70440bf..f74d5db 100644
--- a/templates/question-radio.html
+++ b/templates/question-radio.html
@@ -7,9 +7,10 @@
     {% for n,opt in enumerate(question['options']) %}
             <a class="list-group-item">
                 <input type="radio" id="{{ n }}" name="answer" value="{{ n }}">
-                {{ md(opt) }}
+                <label for="{{ n }}">{{ md(opt) }}</label>
             </a>
     {% end %}
     </div>
 </fieldset>
+<input type="hidden" name="question_ref" value="{{ question['ref'] }}">
 {% end %}
\ No newline at end of file
diff --git a/templates/question-text.html b/templates/question-text.html
index 5c4e460..212217a 100644
--- a/templates/question-text.html
+++ b/templates/question-text.html
@@ -4,4 +4,5 @@
 <fieldset data-role="controlgroup">
     <input type="text" class="form-control" id="answer" name="answer" value="" autofocus>
 </fieldset>
+<input type="hidden" name="question_ref" value="{{ question['ref'] }}">
 {% end %}
\ No newline at end of file
--
libgit2 0.21.2