diff --git a/generic/templates/generic/questionnote_form.html b/generic/templates/generic/questionnote_form.html
index 0a0c27a3..b9cbe915 100755
--- a/generic/templates/generic/questionnote_form.html
+++ b/generic/templates/generic/questionnote_form.html
@@ -4,9 +4,32 @@
 <h2>Add Feedback</h2>
   <form action="" method="post">
     {% csrf_token %}
-    <table>
-    {{ form.as_table }}
-    </table>
+{{ form.non_field_errors }}
+<div class="fieldWrapper">
+    {{ form.content_type.errors }}
+    <label for="{{ form.content_type.id_for_label }}">Content Type</label>
+    {{ form.content_type }}
+</div>
+<div class="fieldWrapper">
+    {{ form.author.errors }}
+    <label for="{{ form.author.id_for_label }}">Author</label>
+    {{ form.author }}
+</div>
+<div class="fieldWrapper">
+    {{ form.object_id.errors }}
+    <label for="{{ form.object_id.id_for_label }}">Object id</label>
+    {{ form.object_id }}
+</div>
+<div class="fieldWrapper">
+    {{ form.note_type.errors }}
+    <label for="{{ form.note_type.id_for_label }}">Note type</label>
+    {{ form.note_type }}
+</div>
+<div class="fieldWrapper">
+    {{ form.note.errors }}
+    <label for="{{ form.note.id_for_label }}">Note</label>
+    {{ form.note }}
+</div>
     <input type="submit" value="Submit">
   </form>
 {% endblock %}