diff --git a/questionnaire/templates/questionnaire/choice-freeform.html b/questionnaire/templates/questionnaire/choice-freeform.html
index 8c068753..65fe0b43 100644
--- a/questionnaire/templates/questionnaire/choice-freeform.html
+++ b/questionnaire/templates/questionnaire/choice-freeform.html
@@ -15,9 +15,11 @@
     <div class="input">
         <input onClick="valchanged('{{ question.number }}', '_entry_');" type="radio" id="{{ question.number }}_entry" name="question_{{ question.number }}" value="_entry_" {% if qdict.sel_entry %} checked {% endif %}>
         {% if question.extra %}
-            <span class="extra-block">{{ question.extra }}</span>
+            <label for="{{ question.number }}_entry"><span class="extra-block">{{ question.extra }}</span></label>
+        {% else %}
+            <label for="{{ question.number }}_entry">{% trans "Other..." %}</label>
         {% endif %}
-       <input id="{{ question.number }}_comment" checks="dep_check('{{ question.number }},_entry_')" type="text" name="question_{{ question.number }}_comment" value="{{ qdict.comment }}">
+       <input id="{{ question.number }}_comment" checks="dep_check('{{ question.number }},_entry_')" type="text" name="question_{{ question.number }}_comment" id="{{ question.number }}_comment" value="{{ qdict.comment }}">
     </div>
 </div>
 
diff --git a/questionnaire/templates/questionnaire/choice-multiple-freeform.html b/questionnaire/templates/questionnaire/choice-multiple-freeform.html
index 71d9edf5..4f4c26e2 100644
--- a/questionnaire/templates/questionnaire/choice-multiple-freeform.html
+++ b/questionnaire/templates/questionnaire/choice-multiple-freeform.html
@@ -5,7 +5,7 @@
         <ul class="inputs-list list-unstyled">
         {% for choice, key, checked, prev_value in qdict.choices %}
             <li>
-<!--                <label> -->
+                <label>
                     <span class="{{ qdict.type }}-text">
                     <input onClick="valchanged('{{ question.number }}_{{ choice.value }}', this.checked);" type="checkbox" id="{{ key }}" name="{{ key }}" value="{{ choice.value }}" {{ checked }}>
                     {{ choice.text }}
@@ -18,7 +18,7 @@
                     &#37;   <!-- percentage sign: all choice-multiple-values currently represent percentages and must add up to 100% -->
                     </span>
                     {% endif %}
-<!--                </label> -->
+               </label>
             </li>
         {% endfor %}
         {% if qdict.type == 'choice-multiple-values' %}
@@ -29,7 +29,11 @@
 
         {% if question.extra %}
             <li>
-                <span class="extra-block">{{ question.extra }}</span>
+                <label for="{{ question.number }}extra"><span class="extra-block">{{ question.extra }}</span></label>
+            </li>
+        {% else %}
+            <li>
+                <label for="{{ question.number }}extra">{% trans "Other..." %}</label>
             </li>
         {% endif %}
         {% if qdict.extras %}
@@ -38,7 +42,7 @@
                 {% if not forloop.last or not forloop.first %}
                     <b>{{ forloop.counter }}.</b> 
                 {% endif %}
-                <input type="text" name="{{ key }}" size="50" value="{{ value }}">    
+                <input type="text" id="{{ question.number }}extra{% if not forloop.first %}{{ forloop.counter }}{% endif %}" name="{{ key }}" size="50" value="{{ value }}">    
             </li>
             {% endfor %}
         {% endif %}
diff --git a/questionnaire/templates/questionnaire/choice-yesnocomment.html b/questionnaire/templates/questionnaire/choice-yesnocomment.html
index 4638816a..b30b71f8 100644
--- a/questionnaire/templates/questionnaire/choice-yesnocomment.html
+++ b/questionnaire/templates/questionnaire/choice-yesnocomment.html
@@ -31,12 +31,12 @@
             
             <!-- comment -->
             {% if qdict.hascomment %}
-            <li>
+            <li><label>
                 {% if question.extra %}
                     <span class="extra-block">{{ question.extra }}</span><br />
                 {% endif %}
                 <input type="text" id="{{ question.number }}_comment" name="question_{{ question.number }}_comment" value="{{ qdict.comment }}" size="50" {{ qdict.checks|safe }} placeholder="{% trans 'comment' %}">
-            </li>
+            </label></li>
             {% endif %}
         </ul>
     </div>
diff --git a/questionnaire/templates/questionnaire/open-textfield.html b/questionnaire/templates/questionnaire/open-textfield.html
index 6fd7988e..cf0c3fcf 100644
--- a/questionnaire/templates/questionnaire/open-textfield.html
+++ b/questionnaire/templates/questionnaire/open-textfield.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="clearfix">
     <div class="input">
-        <textarea class="span8" name="question_{{ question.number }}" cols="60" rows="10">{{ qdict.value }}</textarea>
+        <textarea class="span8" name="question_{{ question.number }}" cols="60" rows="10" id={{ question.number }}>{{ qdict.value }}</textarea>
         {% if question.extra %}
             <span class="help-block">{{ question.extra }}</span>
         {% endif %}
diff --git a/questionnaire/templates/questionnaire/questionset.html b/questionnaire/templates/questionnaire/questionset.html
index 4247da48..eee46ae9 100644
--- a/questionnaire/templates/questionnaire/questionset.html
+++ b/questionnaire/templates/questionnaire/questionset.html
@@ -114,12 +114,14 @@
                     {% include qdict.template %}
                 {% else %}
                     <div class="question-text {% if qdict.required %}required{% endif %}">
+                    <label for="{{ question.number }}">
                         <span class="qnumber">{{ question.display_number|safe }}.</span>
                         {% if question.parse_html %}
                         {{ question.text|safe }}
                         {% else %}
                         {{ question.text }}
                         {% endif %}
+                    </label>
                     </div>
                     <div class="answer">
                         {% if error %}