diff --git a/public/modules/forms/views/directiveViews/field/dropdown.html b/public/modules/forms/views/directiveViews/field/dropdown.html
index 67c2be25..b127dd07 100755
--- a/public/modules/forms/views/directiveViews/field/dropdown.html
+++ b/public/modules/forms/views/directiveViews/field/dropdown.html
@@ -8,10 +8,12 @@
     </div>
     <div class="col-xs-12 field-input ">
 		<ui-select ng-model="field.fieldValue" 
-				theme="selectize"
+				class="focusOn"
+                theme="selectize"
 				ng-model-options="{ debounce: 250 }"  
 				ng-required="field.required" 
 				ng-disabled="field.disabled"
+                ng-click="$root.nextField()"
 				ng-focus="setActiveField(field._id, index, true)">
 			<ui-select-match placeholder="Type or select an option">
 				{{$select.selected.option_value}}
diff --git a/public/modules/forms/views/directiveViews/field/legal.html b/public/modules/forms/views/directiveViews/field/legal.html
index e71338eb..5aed4848 100644
--- a/public/modules/forms/views/directiveViews/field/legal.html
+++ b/public/modules/forms/views/directiveViews/field/legal.html
@@ -9,11 +9,24 @@
             <label class="btn col-xs-5">
                 <input ng-focus="setActiveField(field._id, index, true)" 
                     class="focusOn"
-                    ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" type="radio" value="true" ng-model="field.fieldValue" ng-model-options="{ debounce: 250 }"   ng-required="field.required" ng-disabled="field.disabled"/>
+                    ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" 
+                    type="radio" value="true" 
+                    ng-model="field.fieldValue" 
+                    ng-model-options="{ debounce: 250 }"
+                    ng-required="field.required" 
+                    ng-click="$root.nextField()"
+                    ng-disabled="field.disabled"/>
                 <span> I accept </span>
             </label>
             <label class="btn col-xs-5 col-xs-offset-1">
-                <input ng-focus="setActiveField(field._id, index, true)" ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" type="radio" value="false" ng-model="field.fieldValue" ng-model-options="{ debounce: 250 }"   ng-required="field.required" ng-disabled="field.disabled"/>
+                <input ng-focus="setActiveField(field._id, index, true)" 
+                    ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" 
+                    type="radio" value="false" 
+                    ng-model="field.fieldValue" 
+                    ng-model-options="{ debounce: 250 }"
+                    ng-required="field.required" 
+                    ng-click="$root.nextField()"
+                    ng-disabled="field.disabled"/>
                 <span>I don't accept </span>
             </label>
         </div>
diff --git a/public/modules/forms/views/directiveViews/field/radio.html b/public/modules/forms/views/directiveViews/field/radio.html
index 4c027ef2..2b6a60e0 100755
--- a/public/modules/forms/views/directiveViews/field/radio.html
+++ b/public/modules/forms/views/directiveViews/field/radio.html
@@ -4,14 +4,16 @@
         <div ng-repeat="option in field.fieldOptions" class="row-fluid">
             <label class="btn col-xs-4" style="margin: 0.5em; padding-left:30px" ng-class="{activeBtn: field.fieldValue == field.fieldOptions[$index].option_id}">
                 <input ng-focus="setActiveField(field._id, index, true)" 
-		        ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" 
-                type="radio" 
-                class="focusOn"
-                value="{{option.option_value}}" 
-                ng-model="field.fieldValue" 
-                ng-model-options="{ debounce: 250 }" 
-                ng-required="field.required" 
-                ng-disabled="field.disabled" />
+                    ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" 
+                    type="radio" 
+                    class="focusOn"
+                    value="{{option.option_value}}" 
+                    ng-model="field.fieldValue" 
+                    ng-model-options="{ debounce: 250 }" 
+                    ng-required="field.required"
+                    ng-click="$root.nextField()" 
+                    ng-disabled="field.disabled" />
+                
                 <span ng-bind="option.option_value"></span>
             </label>
         </div>
diff --git a/public/modules/forms/views/directiveViews/field/yes_no.html b/public/modules/forms/views/directiveViews/field/yes_no.html
index efe5b197..144f7c1d 100644
--- a/public/modules/forms/views/directiveViews/field/yes_no.html
+++ b/public/modules/forms/views/directiveViews/field/yes_no.html
@@ -22,7 +22,8 @@
 					ng-model="field.fieldValue" 
 					ng-model-options="{ debounce: 250 }" 
 					ng-required="field.required" 
-					ng-disabled="field.disabled" />
+					ng-click="$root.nextField()"
+                    ng-disabled="field.disabled" />
 				<div class="letter">
 					Y
 				</div>               	
@@ -33,15 +34,16 @@
 	
 	<div class="row" style="margin-top: 10px;">
             <label class="btn btn-default col-md-2 col-sm-3 col-xs-4" 
-		style="background: rgba(0,0,0,0.1); text-align:left;">
+		        style="background: rgba(0,0,0,0.1); text-align:left;">
 	
                 <input type="radio" value="false" 
-			style="opacity:0; margin-left:0px;"
-			ng-focus="setActiveField(field._id, index, true)"
-			ng-model="field.fieldValue" 
-			ng-model-options="{ debounce: 250 }" 
-			ng-required="field.required" 
-			ng-disabled="field.disabled"/>
+			        style="opacity:0; margin-left:0px;"
+			        ng-focus="setActiveField(field._id, index, true)"
+			        ng-model="field.fieldValue" 
+			        ng-model-options="{ debounce: 250 }" 
+			        ng-required="field.required" 
+			        ng-click="$root.nextField()"
+                    ng-disabled="field.disabled"/>
                 	
 			<div class="letter">
                   		N