diff --git a/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html b/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html
index 410eb26527..ceb6d8e141 100644
--- a/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html
+++ b/public/docs/_examples/cb-dynamic-form/ts/app/dynamic-form-question.component.html
@@ -1,13 +1,13 @@
 <!-- #docregion -->
 <div [ngFormModel]="form">
-  <div class="formHeading">{{question.label}}</div>
+  <label [attr.for]="question.key">{{question.label}}</label>
 
   <div [ngSwitch]="question.controlType">
 
-    <input *ngSwitchWhen="'textbox'"   [ngControl]="question.key"
+    <input *ngSwitchWhen="'textbox'" [ngControl]="question.key"
             [id]="question.key" [type]="question.type">
 
-    <select *ngSwitchWhen="'dropdown'" [ngControl]="question.key">
+    <select [id]="question.key" *ngSwitchWhen="'dropdown'" [ngControl]="question.key">
       <option *ngFor="#opt of question.options" [value]="opt.key">{{opt.value}}</option>
     </select>
 
diff --git a/public/resources/images/cookbooks/dynamic-form/dynamic-form.png b/public/resources/images/cookbooks/dynamic-form/dynamic-form.png
index 54b680a672..229477d069 100644
Binary files a/public/resources/images/cookbooks/dynamic-form/dynamic-form.png and b/public/resources/images/cookbooks/dynamic-form/dynamic-form.png differ