diff --git a/ang/form_processor/config/crmFormProcessorSpecification.html b/ang/form_processor/config/crmFormProcessorSpecification.html
index c6d813e3761347cc2eda569fb585fa08329d8172..5defdc2f78f6d29f7026083c5e9312b72aa513e1 100644
--- a/ang/form_processor/config/crmFormProcessorSpecification.html
+++ b/ang/form_processor/config/crmFormProcessorSpecification.html
@@ -1,24 +1,34 @@
 <div ng-if="specification.type == 'specification'">
-	<input
-			crm-ui-field="{name: 'specification.name', title: specification.title, required: specification.required}"
+	<div ng-if="!noLabel" class="label">
+  	<label crm-ui-for="specification.name" crm-depth="1" crm-ui-force-required="specification.required">{{specification.title}}</label>
+	</div>
+	<div ng-attr-class="{{!noLabel ?  'content' : ''}}">
+		<input
       type="text"
       name="{{specification.name}}"
       ng-model="configuration[specification.name]"
       class="big crm-form-text"
       ng-required="specification.required"
     />
+ </div>
+ <div ng-if="!noLabel" class="clear"></div>
 </div>
 <div ng-if="specification.type == 'fields'">
-	<select
-  	crm-ui-id="{name: 'specification.name', title: specification.title, required: specification.required}"
-    name="{{specification.name}}"
-    ui-jq="select2"
-    ui-options="{allowClear: true}"
-    ng-model="configuration[specification.name]"
-    ng-required="specification.required"
-    ng-options="field.name as field.label for field in fields">
-    <option value=""> - {{specification.title}} - </option>
-  </select>
+	<div ng-if="!noLabel" class="label">
+  	<label crm-ui-for="specification.name" crm-depth="1" crm-ui-force-required="specification.required">{{specification.title}}</label>
+	</div>
+	<div ng-attr-class="{{!noLabel ?  'content' : ''}}">	
+		<select
+    	name="{{specification.name}}"
+    	ui-jq="select2"
+    	ui-options="{allowClear: true}"
+    	ng-model="configuration[specification.name]"
+    	ng-required="specification.required"
+    	ng-options="field.name as field.label for field in fields">
+    	<option value=""> - {{specification.title}} - </option>
+  	</select>
+ </div>
+ <div ng-if="!noLabel" class="clear"></div>
 </div>
 <div ng-if="specification.type == 'collection'">
 		<table>
@@ -35,6 +45,7 @@
     					specification="collection_spec"
     					configuration="collection_config"
     					fields="fields"
+    					no-label="true"
     				>
     				</crm-form-processor-specification>
 					</td>
diff --git a/ang/form_processor/config/crmFormProcessorSpecification.js b/ang/form_processor/config/crmFormProcessorSpecification.js
index 09aeeaab9e26a00e1f3200d98daefc9c3e49da9d..fcf456e470d29fdfd568f24da3d226ac132f485b 100644
--- a/ang/form_processor/config/crmFormProcessorSpecification.js
+++ b/ang/form_processor/config/crmFormProcessorSpecification.js
@@ -8,6 +8,7 @@
 	      specification: '=specification',
 	      fields: '=fields',
 	      configuration: '=configuration',
+	      noLabel: '@',
 	    },
 	    templateUrl: '~/form_processor/config/crmFormProcessorSpecification.html',
 	    // Code below is from: https://stackoverflow.com/a/19172067/3853493
@@ -19,6 +20,14 @@
         var compiledContents;
         return function(scope, iElement, iAttr) {
         	scope.ts = CRM.ts(null);
+        	
+        	scope.uiField = {
+        		name: scope.specification.name, 
+        	};
+        	if (!scope.noLabel) {
+        		scope.uiField['title'] = scope.specification.title;
+        		scope.uiField['required'] = scope.specification.required;
+        	}
 
         	scope.addItemToCollection = function addItemToCollection(specificationBag) {
         		var item_config = angular.copy(specificationBag.default_configuration);
diff --git a/ang/form_processor/crmFormProcessorTypeConfiguration.html b/ang/form_processor/crmFormProcessorTypeConfiguration.html
index 92f478f9f5a67f04839eb434107e29a79fd02262..c5512a563f58cdb73d563a92873ce3851ce58862 100644
--- a/ang/form_processor/crmFormProcessorTypeConfiguration.html
+++ b/ang/form_processor/crmFormProcessorTypeConfiguration.html
@@ -1,4 +1,5 @@
-<ng-repeat ng-repeat="spec in type.configuration_spec">
+
+<ng-repeat ng-repeat="spec in type.configuration_spec.parameter_specifications">
 <div crm-ui-field="{name: 'spec.name', title: spec.title, required: spec.required}">
       <input
         type="text"