diff --git a/questionnaire/templates/questionnaire/choice-freeform.html b/questionnaire/templates/questionnaire/choice-freeform.html
index a3f4d32..74d6347 100644
--- a/questionnaire/templates/questionnaire/choice-freeform.html
+++ b/questionnaire/templates/questionnaire/choice-freeform.html
@@ -15,7 +15,9 @@
     <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 %}>
         <input id="{{ question.number }}_comment" checks="dep_check('{{ question.number }},_entry_')" type="input" name="question_{{ question.number }}_comment" value="{{ qdict.comment }}">
-        <span class="help-block">{{ question.extra }}</span>
+        {% if question.extra %}
+            <span class="help-block">{{ question.extra }}</span>
+        {% endif %}
     </div>
 </div>
 
diff --git a/questionnaire/templates/questionnaire/choice-yesnocomment.html b/questionnaire/templates/questionnaire/choice-yesnocomment.html
index d09e4ec..b32fa7b 100644
--- a/questionnaire/templates/questionnaire/choice-yesnocomment.html
+++ b/questionnaire/templates/questionnaire/choice-yesnocomment.html
@@ -33,7 +33,9 @@
             {% if qdict.hascomment %}
             <li>
                 <input type="text" id="{{ question.number }}_comment" name="question_{{ question.number }}_comment" value="{{ qdict.comment }}" size="50" {{ qdict.checks|safe }} placeholder="{% trans 'comment' %}">
-                <span class="help-block">{{ question.extra }}</span>
+                {% if question.extra %}
+                    <span class="help-block">{{ question.extra }}</span>
+                {% endif %}
             </li>
             {% endif %}
         </ul>
diff --git a/questionnaire/templates/questionnaire/choice.html b/questionnaire/templates/questionnaire/choice.html
index 721cca4..8845c53 100644
--- a/questionnaire/templates/questionnaire/choice.html
+++ b/questionnaire/templates/questionnaire/choice.html
@@ -10,6 +10,11 @@
                 </label>
             </li>
         {% endfor %}
+        {% if question.extra %}
+            <li>
+                <span class="help-block">{{ question.extra }}</span>
+            </li>
+        {% endif %}
         </ul>
     </div>
 </div>
\ No newline at end of file
diff --git a/questionnaire/templates/questionnaire/open-textfield.html b/questionnaire/templates/questionnaire/open-textfield.html
index 3cde6b9..05af4d8 100644
--- a/questionnaire/templates/questionnaire/open-textfield.html
+++ b/questionnaire/templates/questionnaire/open-textfield.html
@@ -2,5 +2,8 @@
 <div class="clearfix">
     <div class="input">
         <textarea class="span8" name="question_{{ question.number }}" cols="60" rows="10"></textarea>
+        {% if question.extra %}
+            <span class="help-block">{{ question.extra }}</span>
+        {% endif %}
     </div>
 </div>
diff --git a/questionnaire/templates/questionnaire/open.html b/questionnaire/templates/questionnaire/open.html
index 81e49ff..7d083b7 100644
--- a/questionnaire/templates/questionnaire/open.html
+++ b/questionnaire/templates/questionnaire/open.html
@@ -3,6 +3,8 @@
     
     <div class="input">
         <input type="text" class="span8" size="60" id="{{ question.number }}" name="question_{{ question.number }}" value="{{ qdict.value }}">
-        <span class="help-block">{{ question.extra }}</span>
+        {% if question.extra %}
+            <span class="help-block">{{ question.extra }}</span>
+        {% endif %}
     </div>
 </div>
diff --git a/questionnaire/templates/questionnaire/questionset.html b/questionnaire/templates/questionnaire/questionset.html
index 1807dc9..8972cd1 100644
--- a/questionnaire/templates/questionnaire/questionset.html
+++ b/questionnaire/templates/questionnaire/questionset.html
@@ -80,10 +80,12 @@
                     </div>
                 {% endif %}
             </div> <!-- /question container -->
-            <div class="question-footer">
-                {{ question.footer|textile }}
-                <div class="clearfix"></div>
-            </div>
+            {% if question.footer %}
+                <div class="question-footer">
+                    {{ question.footer|textile }}
+                    <div class="clearfix"></div>
+                </div>
+            {% endif %}
         {% endwith %}
         {% endfor %}
     
diff --git a/questionnaire/templates/questionnaire/range.html b/questionnaire/templates/questionnaire/range.html
index a93ba3e..0e7e281 100644
--- a/questionnaire/templates/questionnaire/range.html
+++ b/questionnaire/templates/questionnaire/range.html
@@ -3,5 +3,7 @@
         <input name="question_{{ question.number }}" type="range" min="{{ qdict.rmin }}" max="{{ qdict.rmax }}" step="{{ qdict.rstep }}" value="{{ qdict.current }}">
     </div>
     <label data-unit="{{ qdict.runit }}">{{ qdict.runit }}</label>
-    <span class="help-block">{{ question.extra }}</span>
+    {% if question.extra %}
+        <span class="help-block">{{ question.extra }}</span>
+    {% endif %}
 </div>
\ No newline at end of file
diff --git a/questionnaire/templates/questionnaire/timeperiod.html b/questionnaire/templates/questionnaire/timeperiod.html
index 98d7691..72561c1 100644
--- a/questionnaire/templates/questionnaire/timeperiod.html
+++ b/questionnaire/templates/questionnaire/timeperiod.html
@@ -6,5 +6,8 @@
             <option value="{{ val }}"{% if sel %} selected="selected"{% endif %}>{{ desc }}</option>
         {% endfor %}
         </select>
+        {% if question.extra %}
+            <span class="help-block">{{ question.extra }}</span>
+        {% endif %}
     </div>
 </div>