diff --git a/dmp-admin/src/app/app.module.ts b/dmp-admin/src/app/app.module.ts
index 8417c6461..797f41c11 100644
--- a/dmp-admin/src/app/app.module.ts
+++ b/dmp-admin/src/app/app.module.ts
@@ -62,7 +62,7 @@ import { DatasetprofileEditorComponent } from './managers/datasetprofile-editor/
 import { DatasetProfileGUIEditorComponent } from './dataset-profile-gui-editor/dataset-profile-gui-editor.component';
 
 import { FieldFormComponent } from './field-form/field-form.component';
-import { FormComponent } from './formBuilder/form.component';
+import { FormComponent } from './form/form.component';
 import { GroupFieldFormComponent } from './groupfield-form/groupfield-form.component';
 import { RuleFormComponent } from './rule-component/rule.component';
 import { SectionFormComponent } from './section-form/section-form.component';
diff --git a/dmp-admin/src/app/compositefield-form/compositefield-form.component.html b/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
index 84663eee8..1d60b34a7 100644
--- a/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
+++ b/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
@@ -2,9 +2,19 @@
     <div [formGroup]="form">
         <div class="form-row">
             <div class="form-group col-md-12">
-                <div class="form-group col-md-4">
-                    <label>Multiplicity</label>
-                    <input type="nymber" class="form-control" formControlName="multiplicity">
+                <div formGroupName="multiplicity">
+                    <div class="form-group">
+                        <h5 style="margin-left:15px; font-weight:bold;">Multiplicity</h5>
+                        <div class="col-md-2">
+                            <label>Min</label>
+                            <input type="number" class="form-control" formControlName="min">
+                        </div>
+
+                        <div class="col-md-2">
+                            <label>Max</label>
+                            <input type="number" class="form-control" formControlName="max">
+                        </div>
+                    </div>
                 </div>
                 <div class="form-group col-md-4">
                     <label>Ordinal</label>
diff --git a/dmp-admin/src/app/field-form/field-form.component.html b/dmp-admin/src/app/field-form/field-form.component.html
index 724c598ac..062a0d12d 100644
--- a/dmp-admin/src/app/field-form/field-form.component.html
+++ b/dmp-admin/src/app/field-form/field-form.component.html
@@ -1,4 +1,4 @@
-<div>    
+<div>
     <div [formGroup]="form">
         <div class="form-row">
             <div class="form-group col-md-6">
@@ -10,16 +10,19 @@
                 <input type="text" class="form-control" formControlName="id">
             </div>
             <div class="form-row col-md-3">
-                <div class="form-group">
-                    <label>View style</label>
-                    <select class="form-control" formControlName="viewStyle">
-                        <option>textarea</option>
-                        <option>booleanDesicion</option>
-                        <option>combobox</option>
-                        <option>checkBox</option>
-                        <option>freetext</option>
-                    </select>
+                <div formGroupName="viewStyle">
+                    <div class="form-group">
+                        <label>View style</label>
+                        <select class="form-control" formControlName="renderStyle">
+                            <option>textarea</option>
+                            <option>booleanDesicion</option>
+                            <option>combobox</option>
+                            <option>checkBox</option>
+                            <option>freetext</option>
+                         </select>
+                    </div>
                 </div>
+
             </div>
 
         </div>
@@ -31,52 +34,56 @@
             <div class="form-group col-md-6">
                 <label>extendedDescription</label>
                 <input type="text" class="form-control" formControlName="extendedDescription">
-            </div>            
+            </div>
         </div>
         <div class="form-row">
             <div formGroupName="multiplicity">
                 <div class="form-group">
+                    <h5 style="margin-left:15px; font-weight:bold;">Multiplicity</h5>
                     <div class="col-md-2">
-                        <label>Multiplicity</label>
-                        <input type="number" class="form-control" formControlName="min" placeholder="Min">
+                        <label>Min</label>
+                        <input type="number" class="form-control" formControlName="min">
                     </div>
 
                     <div class="col-md-2">
-                        <!-- <label>Multiplicity</label> -->
-                        <input type="number" class="form-control" formControlName="max" placeholder="Max">
+                        <label>Max</label>
+                        <input type="number" class="form-control" formControlName="max">
                     </div>
                 </div>
             </div>
             <div class="form-group col-md-2">
-                    <label>Ordinal</label>
-                    <input type="number" class="form-control" formControlName="ordinal">
-                </div>
-            <div class="form-group col-md-4">
-                <label>Default Value</label>
-                <input type="text" class="form-control" formControlName="value">
+                <label>Ordinal</label>
+                <input type="number" class="form-control" formControlName="ordinal">
             </div>
-            <div class="form-group col-md-2">
+            <div formGroupName="defaultValue">
+                <div class="form-group col-md-4">
+                    <label>Default Value</label>
+                    <input type="text" class="form-control" formControlName="value">
+                </div>
+            </div>
+
+            <div  class="form-group col-md-2">
                 <label class="radio control-label">Default Visibility</label>
                 <label class="radio-inline">
-                    <input type="radio" name="defaultVisibility" id="inlineRadio1" value="true" formControlName="defaultVisibility"> true
+                    <input type="radio"  [value]="true" formControlName="defaultVisibility"> true
                 </label>
                 <label class="radio-inline">
-                    <input type="radio" name="defaultVisibility" id="inlineRadio2" value="false" formControlName="defaultVisibility"> false
+                    <input type="radio" [value]="false" formControlName="defaultVisibility"> false
                 </label>
             </div>
         </div>
 
     </div>
-    <!-- <div *ngFor="let rule of dataModel.rules let i=index;">
+    <!-- <div *ngFor="let rule of dataModel.visible.rules let i=index;">
         <h4 style="text-decoration: underline;">Rules <button type="button" class="btn btn-sm" style="margin-left:5px;" (click)="DeleteRule(i);"><span class="glyphicon glyphicon-erase"></span></button></h4>            
-        <rule-form [form]="form.get('rules').get(''+i)" [dataModel]="rule"></rule-form>
+        <rule-form [form]="form.get('visible').get('rules').get(''+i)" [dataModel]="rule"></rule-form>
         <div>
             <a (click)="addNewRule(form)" style="cursor: pointer">
                 Add another rule +
             </a>
         </div>
     </div>
-    <div *ngIf="dataModel.rules.length == 0;">
+    <div *ngIf="dataModel.visible.rules.length == 0;">
         <a (click)="addNewRule(form)" style="cursor: pointer">
             Add another rule +
         </a>
diff --git a/dmp-admin/src/app/field-form/field-form.component.ts b/dmp-admin/src/app/field-form/field-form.component.ts
index 220234949..ac6353a43 100644
--- a/dmp-admin/src/app/field-form/field-form.component.ts
+++ b/dmp-admin/src/app/field-form/field-form.component.ts
@@ -24,13 +24,13 @@ ngOnInit(){
 
 addNewRule(){
   let rule: Rule = new Rule();
-  this.dataModel.rules.push(rule);
-  (<FormArray>this.form.get("rules")).push(rule.buildForm());
+  this.dataModel.visible.rules.push(rule);
+  (<FormArray>this.form.get("visible").get("rules")).push(rule.buildForm());
 }
 
 DeleteRule(index){
-  this.dataModel.rules.splice(index);
-  (<FormArray>this.form.get("rules")).removeAt(index);
+  this.dataModel.visible.rules.splice(index);
+  (<FormArray>this.form.get("visible").get("rules")).removeAt(index);
 }
     
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/formBuilder/form.component.html b/dmp-admin/src/app/form/form.component.html
similarity index 100%
rename from dmp-admin/src/app/formBuilder/form.component.html
rename to dmp-admin/src/app/form/form.component.html
diff --git a/dmp-admin/src/app/formBuilder/form.component.ts b/dmp-admin/src/app/form/form.component.ts
similarity index 89%
rename from dmp-admin/src/app/formBuilder/form.component.ts
rename to dmp-admin/src/app/form/form.component.ts
index ac8f4c1c7..418ad101b 100644
--- a/dmp-admin/src/app/formBuilder/form.component.ts
+++ b/dmp-admin/src/app/form/form.component.ts
@@ -43,6 +43,9 @@ export class FormComponent {
       
       this.addSection();
     }
+
+    // this.dataModel = new JsonSerializer<DatasetProfileModel>().fromJSONObject(TestModel, DatasetProfileModel);
+    // this.form = this.dataModel.buildForm();
   }
 
   addSection() {
@@ -57,12 +60,12 @@ export class FormComponent {
   }
 
   updateForm(data) {
-    return this.restBase.post("", data);
+    return this.restBase.post("/admin/addDmp", data);
   }
 
   onSubmit() {
     debugger;
-    let data = JSON.stringify(this.form.value);
+    let data = this.form.value;
     this.updateForm(data).subscribe();
   }
 
diff --git a/dmp-admin/src/app/groupfield-form/groupfield-form.component.html b/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
index 04c141f5c..6dec8b40f 100644
--- a/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
+++ b/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
@@ -15,12 +15,12 @@
                 <input type="text" class="form-control" formControlName="ordinal">
             </div>
             <div class="form-group col-md-3">
-                <label class="radio control-label">DefaultVisibility</label>
+                <label class="radio control-label">Default Visibility</label>
                 <label class="radio-inline">
-                    <input type="radio" id="defaultVisibility" value="true" formControlName="defaultVisibility"> true
+                    <input type="radio" [value]="true" formControlName="defaultVisibility"> true
                 </label>
                 <label class="radio-inline">
-                    <input type="radio" id="defaultVisibility" value="false" formControlName="defaultVisibility"> false
+                    <input type="radio" [value]="false" formControlName="defaultVisibility"> false
                 </label>
             </div>
         </div>
@@ -44,7 +44,7 @@
         <compositefield-form [form]="form.get('compositeFields').get(''+i)" [dataModel]="field"></compositefield-form>
 
         <div>
-            <a (click)="addNewField()" style="cursor: pointer">
+            <a (click)="addNewFieldSet()" style="cursor: pointer">
                 Add another field Set (CompositeField) +
             </a>
         </div>
@@ -52,7 +52,7 @@
     </div>
 
     <div *ngIf="dataModel.compositeFields.length == 0;">
-        <a (click)="addNewField()" style="cursor: pointer">
+        <a (click)="addNewFieldSet()" style="cursor: pointer">
             Add another field Set (CompositeField) +
         </a>
     </div>
diff --git a/dmp-admin/src/app/groupfield-form/groupfield-form.component.ts b/dmp-admin/src/app/groupfield-form/groupfield-form.component.ts
index 846821fea..cf687ba56 100644
--- a/dmp-admin/src/app/groupfield-form/groupfield-form.component.ts
+++ b/dmp-admin/src/app/groupfield-form/groupfield-form.component.ts
@@ -3,6 +3,7 @@ import { FormGroup } from '@angular/forms';
 import { FieldGroup } from '../models/FieldGroup';
 import { CompositeField } from '../models/CompositeField';
 import { FormArray } from '@angular/forms/src/model';
+import { Field } from '../models/Field';
 
 @Component({
   selector: 'groupfield-form',
@@ -21,10 +22,17 @@ export class GroupFieldFormComponent {
     //this.addNewField();
   }
 
-  addNewField(){
+  addNewFieldSet(){
     let compositeField: CompositeField = new CompositeField();
+
+    let field: Field = new Field(); //create field at the same time
+    compositeField.fields.push(field);
+    //(<FormArray>this.form.get("compositeFields").get("fields")).push(field.buildForm());
+
+   
     this.dataModel.compositeFields.push(compositeField);
     (<FormArray>this.form.get("compositeFields")).push(compositeField.buildForm());
+    
   }
 
   DeleteFieldSet(index){
diff --git a/dmp-admin/src/app/models/CompositeField.ts b/dmp-admin/src/app/models/CompositeField.ts
index 89463970a..cd3c54c66 100644
--- a/dmp-admin/src/app/models/CompositeField.ts
+++ b/dmp-admin/src/app/models/CompositeField.ts
@@ -3,16 +3,18 @@ import { JsonSerializer } from '../utilities/JsonSerializer';
 import { Serializable } from './interfaces/Serializable';
 import { BaseModel } from './BaseModel';
 import {Field} from './Field' 
+import {Multiplicity} from './Multiplicity' 
+
 export class CompositeField extends BaseModel implements Serializable<CompositeField> {
     public fields:Array<Field> = new Array<Field>();
-    public multiplicity:number;
     public id:string;
     public ordinal:number;
+    public multiplicity: Multiplicity = new Multiplicity();
 
     fromJSONObject(item:any):CompositeField{
         
         this.fields = new JsonSerializer<Field>().fromJSONArray(item.fields,Field);
-        this.multiplicity = item.multiplicity;
+        this.multiplicity = new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity);
         this.id = item.id;
         this.ordinal = item.ordinal;
         return this;
@@ -20,7 +22,6 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
 
     buildForm():FormGroup{
         let formGroup = this.formBuilder.group({
-            multiplicity:[this.multiplicity],
             id:[this.id],
             ordinal:[this.ordinal]
         });
@@ -31,6 +32,8 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
             fieldsFormArray.push(form)
         })
         formGroup.addControl('fields', this.formBuilder.array(fieldsFormArray));
+        formGroup.addControl("multiplicity", this.multiplicity.buildForm());
+
         return formGroup;
     }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/DefaultValue.ts b/dmp-admin/src/app/models/DefaultValue.ts
new file mode 100644
index 000000000..c06ca586c
--- /dev/null
+++ b/dmp-admin/src/app/models/DefaultValue.ts
@@ -0,0 +1,24 @@
+import { BaseModel } from './BaseModel';
+import { FormGroup } from '@angular/forms';
+import { FormGenerator } from './interfaces/FormGenerator';
+import { Serializable } from './interfaces/Serializable';
+
+export class DefaultValue extends BaseModel implements Serializable<DefaultValue>,FormGenerator<FormGroup>{
+    public type:string;
+    public value:string;
+
+    fromJSONObject(item:any):DefaultValue{
+        this.type = item.type;
+        this.value = item.value;
+        return this;
+    }
+
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            type: [this.type],
+            value: [this.value]
+                     
+        });        
+        return formGroup;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/Field.ts b/dmp-admin/src/app/models/Field.ts
index 5e8b5f3f1..00cc79bc1 100644
--- a/dmp-admin/src/app/models/Field.ts
+++ b/dmp-admin/src/app/models/Field.ts
@@ -3,35 +3,38 @@ import { FormGroup } from '@angular/forms';
 import { FormGenerator } from './interfaces/FormGenerator';
 import { JsonSerializer } from '../utilities/JsonSerializer';
 import { Serializable } from './interfaces/Serializable';
-import {Rule} from './Rule' 
-import {Multiplicity} from './Multiplicity' 
+import {Rule} from './Rule';
+import {Multiplicity} from './Multiplicity';
+import {DefaultValue} from './DefaultValue';
+import {ViewStyle} from './ViewStyle';
+import {Visibility} from './Visibility';
 
 export class Field extends BaseModel implements Serializable<Field>,FormGenerator<FormGroup>{
 
     public id:string;
     public title:string;
-    public value:string;
+    public defaultValue:DefaultValue = new DefaultValue;
     public description:string;
     public extendedDescription:string;
-    public viewStyle:string;
+    public viewStyle:ViewStyle = new ViewStyle();
     public defaultVisibility:boolean;
     public page:number;
     public multiplicity: Multiplicity = new Multiplicity();
     public ordinal: number;
-    public rules: Array<Rule> = new Array<Rule>();
+    public visible: Visibility = new Visibility();
 
     fromJSONObject(item:any):Field{
         this.id = item.id;
         this.title = item.title;
-        this.value = item.value;
+        this.defaultValue = new JsonSerializer<DefaultValue>().fromJSONObject(item.defaultValue, DefaultValue);
         this.description = item.description;
-        this.extendedDescription = item.extendedDescription;        
-        this.viewStyle = item.viewStyle;
+        this.extendedDescription = item.extendedDescription;
         this.defaultVisibility = item.defaultVisibility;
         this.page = item.page;
         this.multiplicity =  new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity);
         this.ordinal = item.ordinal;
-        this.rules = new JsonSerializer<Rule>().fromJSONArray(item.rule, Rule);
+        this.viewStyle = new JsonSerializer<ViewStyle>().fromJSONObject(item.viewStyle, ViewStyle);
+        this.visible = new JsonSerializer<Visibility>().fromJSONObject(item.visible, Visibility);
         return this;
     }
 
@@ -39,27 +42,18 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
         let formGroup = this.formBuilder.group({
             id: [this.id],
             title: [this.title],
-            value: [this.value],
             description: [this.description],
             extendedDescription:[this.extendedDescription],
-            viewStyle: [this.viewStyle],
             defaultVisibility:[this.defaultVisibility],
             page:[this.page] ,
             ordinal:[this.ordinal]
-        });
-        
-        let rulesFormArray = new Array<FormGroup>();
-        if (this.rules){
-            this.rules.forEach(rule =>{
-                let form:FormGroup = rule.buildForm();
-                rulesFormArray.push(form);
-            });
-        }   
+        });        
+           
 
-        formGroup.addControl("multiplicity", this.multiplicity.buildForm());
-        formGroup.addControl("rules", this.formBuilder.array(rulesFormArray));
-
-        
+        formGroup.addControl("multiplicity", this.multiplicity.buildForm());        
+        formGroup.addControl("defaultValue", this.defaultValue.buildForm());
+        formGroup.addControl("viewStyle", this.viewStyle.buildForm()); 
+        //formGroup.addControl("visible", this.visible.buildForm());
 
         return formGroup;
     }
diff --git a/dmp-admin/src/app/models/Rule.ts b/dmp-admin/src/app/models/Rule.ts
index d54d39098..cc1a0f4b3 100644
--- a/dmp-admin/src/app/models/Rule.ts
+++ b/dmp-admin/src/app/models/Rule.ts
@@ -4,25 +4,30 @@ import { FormGenerator } from './interfaces/FormGenerator';
 import { Serializable } from './interfaces/Serializable';
 export class Rule extends BaseModel implements Serializable<Rule>,FormGenerator<FormGroup>{
     public sourceField:string;
-    public targetField:string;
-    public requiredValue;
-    public type: string;
+    public target:string;
+    public value: string;
+    public ruleType: string;
+    public ruleStyle: string;
+    public valueType: string;
 
     fromJSONObject(item:any):Rule{
         this.sourceField = item.sourceField;
-        this.targetField = item.targetField;
-        this.requiredValue = item.requiredValue;
-        this.type = item.type;
+        this.target = item.target;
+        this.value = item.value;
+        this.ruleType = item.ruleType;
+        this.ruleStyle = item.ruleStyle;
+        this.valueType = item.valueType;
         return this;
     }
 
     buildForm():FormGroup{
         let formGroup = this.formBuilder.group({
             sourceField: [this.sourceField],
-            targetField: [this.targetField],
-            requiredValue: [this.requiredValue],
-            type: [this.type]
-                     
+            target: [this.target],
+            ruleStyle: [this.ruleStyle],
+            value: [this.value],
+            ruleType: [this.ruleType],
+            valueType: [this.valueType]                     
         });        
         return formGroup;
     }
diff --git a/dmp-admin/src/app/models/ViewStyle.ts b/dmp-admin/src/app/models/ViewStyle.ts
new file mode 100644
index 000000000..665a2bab6
--- /dev/null
+++ b/dmp-admin/src/app/models/ViewStyle.ts
@@ -0,0 +1,24 @@
+import { BaseModel } from './BaseModel';
+import { FormGroup } from '@angular/forms';
+import { FormGenerator } from './interfaces/FormGenerator';
+import { Serializable } from './interfaces/Serializable';
+
+export class ViewStyle extends BaseModel implements Serializable<ViewStyle>,FormGenerator<FormGroup>{
+    public cssClass:string;
+    public renderStyle:string;
+
+    fromJSONObject(item:any):ViewStyle{
+        this.cssClass = item.cssClass;
+        this.renderStyle = item.renderStyle;
+        return this;
+    }
+
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            cssClass: [this.cssClass],
+            renderStyle: [this.renderStyle]
+                     
+        });        
+        return formGroup;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/Visibility.ts b/dmp-admin/src/app/models/Visibility.ts
new file mode 100644
index 000000000..979ee5adf
--- /dev/null
+++ b/dmp-admin/src/app/models/Visibility.ts
@@ -0,0 +1,37 @@
+import { BaseModel } from './BaseModel';
+import { Rule } from "./Rule";
+import { FormGenerator } from "./interfaces/FormGenerator";
+import { FormGroup } from '@angular/forms';
+import { Serializable } from './interfaces/Serializable';
+import { JsonSerializer } from '../utilities/JsonSerializer';
+
+export class Visibility extends BaseModel implements Serializable<Visibility>, FormGenerator<FormGroup>{
+    public rules: Array<Rule> = new Array<Rule>();
+    public style:string;
+    
+    fromJSONObject(item:any):Visibility{
+        this.rules = new JsonSerializer<Rule>().fromJSONArray(item.rules, Rule);
+        this.style = item.style;
+
+        return this;
+    }
+
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            style:[this.style]
+        })
+
+        let rulesFormArray = new Array<FormGroup>();
+        if (this.rules){
+            this.rules.forEach(rule =>{
+                let form:FormGroup = rule.buildForm();
+                rulesFormArray.push(form);
+            });
+        }
+
+        formGroup.addControl("rules", this.formBuilder.array(rulesFormArray));
+
+        return formGroup;
+    }
+    
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/data.ts b/dmp-admin/src/app/models/data.ts
new file mode 100644
index 000000000..bcc3b8d2a
--- /dev/null
+++ b/dmp-admin/src/app/models/data.ts
@@ -0,0 +1,24 @@
+import { BaseModel } from './BaseModel';
+import { FormGroup } from '@angular/forms';
+import { FormGenerator } from './interfaces/FormGenerator';
+import { Serializable } from './interfaces/Serializable';
+
+export class Data extends BaseModel implements Serializable<Data>,FormGenerator<FormGroup>{
+    public type:string;
+    public url:string;
+
+    fromJSONObject(item:any):Data{
+        this.type = item.type;
+        this.url = item.url;
+        return this;
+    }
+
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            type: [this.type],
+            url: [this.url]
+                     
+        });        
+        return formGroup;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/routes.ts b/dmp-admin/src/app/routes.ts
index c0765cab2..903c9dfde 100644
--- a/dmp-admin/src/app/routes.ts
+++ b/dmp-admin/src/app/routes.ts
@@ -1,4 +1,4 @@
-import { FormComponent } from './formBuilder/form.component';
+import { FormComponent } from './form/form.component';
 import { ModuleWithProviders }  from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
@@ -79,9 +79,14 @@ export const routes: Routes = [
   {
     path: 'form/:id',
     component: FormComponent
+  },
+  {
+    path: 'form',
+    component: FormComponent
   }
 
 
+
 ];
 
 
diff --git a/dmp-admin/src/app/rule-component/rule.component.html b/dmp-admin/src/app/rule-component/rule.component.html
index 14b072ecf..db0d76feb 100644
--- a/dmp-admin/src/app/rule-component/rule.component.html
+++ b/dmp-admin/src/app/rule-component/rule.component.html
@@ -3,13 +3,13 @@
         <div class="form-row">
             <div class="form-group col-md-4">
                 <label>Rule Type</label>
-                <select class="form-control" formControlName="type">
+                <select class="form-control" formControlName="ruleType">
                     <option>field value</option>
                 </select>
             </div>
             <div class="form-group col-md-4">
                 <label>Target</label>
-                <input type="text" class="form-control" placeholder="field id" formControlName="targetField">
+                <input type="text" class="form-control" placeholder="field id" formControlName="target">
             </div>
             <div class="form-group col-md-4">
                 <label>Rule style</label>
@@ -22,11 +22,11 @@
             </div>
             <div class="form-group col-md-6">
                 <label>Value Type</label>
-                <input type="text" class="form-control">
+                <input type="text" class="form-control" formControlName="valueType">
             </div>
             <div class="form-group col-md-6">
                 <label>Value</label>
-                <input type="text" class="form-control" formControlName="requiredValue">
+                <input type="text" class="form-control" formControlName="value">
             </div>
         </div>
     </div>
diff --git a/dmp-admin/src/app/section-form/section-form.component.html b/dmp-admin/src/app/section-form/section-form.component.html
index dad32002f..2763192bc 100644
--- a/dmp-admin/src/app/section-form/section-form.component.html
+++ b/dmp-admin/src/app/section-form/section-form.component.html
@@ -15,12 +15,12 @@
                 <input type="text" class="form-control" formControlName="ordinal">
             </div>
             <div class="form-group col-md-3">
-                <label class="radio control-label">defaultVisibility</label>
+                <label class="radio control-label">Default Visibility</label>
                 <label class="radio-inline">
-                    <input type="radio" name="defaultVisibility" id="inlineRadio1" value="true" formControlName="defaultVisibility"> true
+                    <input type="radio" [value]="true" formControlName="defaultVisibility"> true
                 </label>
                 <label class="radio-inline">
-                    <input type="radio" name="defaultVisibility" id="inlineRadio2" value="false" formControlName="defaultVisibility"> false
+                    <input type="radio" [value]="false" formControlName="defaultVisibility"> false
                 </label>
             </div>
         </div>
@@ -48,5 +48,11 @@
         </div>
     </div>
 
+    <div>
+            <a (click)="addGroupField()" style="cursor: pointer">
+                Add another group +
+            </a>
+        </div>
+
 
 </div>
\ No newline at end of file
diff --git a/dmp-frontend/src/app/testModel/testmodel.ts b/dmp-frontend/src/app/testModel/testmodel.ts
index bd311badb..65692431a 100644
--- a/dmp-frontend/src/app/testModel/testmodel.ts
+++ b/dmp-frontend/src/app/testModel/testmodel.ts
@@ -94,38 +94,13 @@ export const TestModel = {
                                         "renderStyle": "checkBox",
                                         "cssClass": ""
                                     },
-                                    "visible": {
-                                        "rules": [
-                                            {
-                                                "ruleType": "fieldValue",
-                                                "target": "metadataStandarsA211",
-                                                "ruleStyle": "boolean",
-                                                "value": "true",
-                                                "valueType": "boolean"
-                                            },
-                                            {
-                                                "ruleType": "fieldValue",
-                                                "target": "freeOfChargeGroupCommentA213",
-                                                "ruleStyle": "boolean",
-                                                "value": "true",
-                                                "valueType": "boolean"
-                                            },
-                                            {
-                                                "ruleType": "fieldValue",
-                                                "target": "standardisedVocabulariesA212",
-                                                "ruleStyle": "boolean",
-                                                "value": "true",
-                                                "valueType": "boolean"
-                                            }
-                                        ]
+                                    "defaultValue":{
+                                        "type":"any",
+                                        "value":""
                                     },
-                                    "defaultValue": {
-                                        "type": "any",
-                                        "value": ""
-                                    },
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
+                                    "multiplicity":{
+                                        "min":"1",
+                                        "max":"1"
                                     },
                                     "data": {
 
@@ -141,16 +116,13 @@ export const TestModel = {
                                         "renderStyle": "radiobox",
                                         "cssClass": ""
                                     },
-                                    "defaultValue": {
-                                        "type": "any",
-                                        "value": ""
+                                    "defaultValue":{
+                                        "type":"any",
+                                        "value":""
                                     },
-                                    "visible": {
-                                        "rules": []
-                                    },
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
+                                    "multiplicity":{
+                                        "min":"1",
+                                        "max":"1"
                                     },
                                     "data": {
                                         "options": [
@@ -160,12 +132,7 @@ export const TestModel = {
                                         ]
                                     }
                                 }
-                            ],"multiplicity": {
-                                "min": "1",
-                                "max": "1"
-                            },
-                            "id":"useMetadataQ211fs",
-                            "ordinal":1
+                            ]
                         }
                     ]
                 }
@@ -209,36 +176,19 @@ export const TestModel = {
                                                 "renderStyle": "booleanDecision",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": [
-                                                    {
-                                                        "ruleType": "fieldValue",
-                                                        "target": "noMetadata",
-                                                        "ruleStyle": "boolean",
-                                                        "value": "true",
-                                                        "valueType": "boolean"
-                                                    }
-                                                ]
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
                                         }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"useMetadataQ211fs",
-                                    "ordinal":1
+                                    ]
                                 },
                                 {
                                     "fields":
@@ -253,29 +203,19 @@ export const TestModel = {
                                                 "renderStyle": "combobox",
                                                 "cssClass": ""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "visible": {
-                                                "rules": []
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
                                                 "type": "autocomplete",
                                                 "url": "http://dionysus.di.uoa.gr:8080/dmp-backend/rest/external/datarepos?query=gree"
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"metadataStandarsA211fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields":
@@ -290,36 +230,19 @@ export const TestModel = {
                                                 "renderStyle": "checkBox",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": [
-                                                    {
-                                                        "ruleType": "fieldValue",
-                                                        "target": "",
-                                                        "ruleStyle": "boolean",
-                                                        "value": "",
-                                                        "valueType": "boolean"
-                                                    }
-                                                ]
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
                                         }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"notlistedA211fs",
-                                    "ordinal":1
+                                    ]
                                 },
                                 {
                                     "fields":
@@ -334,28 +257,18 @@ export const TestModel = {
                                                 "renderStyle": "freetext",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"notlistedUrlA211fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields":
@@ -370,28 +283,18 @@ export const TestModel = {
                                                 "renderStyle": "freetext",
                                                 "cssClass": ""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "visible": {
-                                                "rules": []
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"notlistedCommentA211fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields":
@@ -406,28 +309,19 @@ export const TestModel = {
                                                 "renderStyle": "checkBox",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
                                         }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"noMetadatafs",
-                                    "ordinal":1
+                                    ]
                                 }
                             ]
                         },
@@ -452,28 +346,18 @@ export const TestModel = {
                                                 "renderStyle": "booleanDesicion",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"nuseVocabulariesQ212fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields": [
@@ -487,16 +371,13 @@ export const TestModel = {
                                                 "renderStyle": "combobox",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
                                                 "type": "wordlist",
@@ -506,14 +387,7 @@ export const TestModel = {
                                                     { "label": "Panagiotis", "value": "mpotis" }
                                                 ]
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"standardisedVocabulariesA212fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields": [
@@ -527,28 +401,18 @@ export const TestModel = {
                                                 "renderStyle": "checkBox",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"notlistedVocabularyA212fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields": [
@@ -562,28 +426,18 @@ export const TestModel = {
                                                 "renderStyle": "freetext",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"notlistedVocUrlA212fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields": [
@@ -597,28 +451,18 @@ export const TestModel = {
                                                 "renderStyle": "freetext",
                                                 "cssClass": ""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "visible": {
-                                                "rules": []
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"notlistedVocCommentA212fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields": [
@@ -628,32 +472,23 @@ export const TestModel = {
                                             "title": "The metadata will not make use of any vocabulary",
                                             "description": "",
                                             "extendedDescription": "",
-                                            "viewStyle": {
+                                            "viewStyle":  {
                                                 "renderStyle": "checkBox",
                                                 "cssClass": ""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "visible": {
-                                                "rules": []
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
                                         }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"noMetadataVocabularyA212fs",
-                                    "ordinal":1
+                                    ]
                                 }
                             ]
                         },
@@ -678,28 +513,18 @@ export const TestModel = {
                                                 "renderStyle": "booleanDesicion",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
-                                        }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"freeOfChargeGroupQ213fs",
-                                    "ordinal":1
+                                        }]
                                 },
                                 {
                                     "fields": [
@@ -713,28 +538,19 @@ export const TestModel = {
                                                 "renderStyle": "freetext",
                                                 "cssClass": ""
                                             },
-                                            "visible": {
-                                                "rules": []
+                                            "defaultValue":{
+                                                "type":"any",
+                                                "value":""
                                             },
-                                            "defaultValue": {
-                                                "type": "any",
-                                                "value": ""
-                                            },
-                                            "multiplicity": {
-                                                "min": "1",
-                                                "max": "1"
+                                            "multiplicity":{
+                                                "min":"1",
+                                                "max":"1"
                                             },
                                             "data": {
 
                                             }
                                         }
-                                    ],
-                                    "multiplicity": {
-                                        "min": "1",
-                                        "max": "1"
-                                    },
-                                    "id":"freeOfChargeGroupCommentA213fs",
-                                    "ordinal":1
+                                    ]
                                 }
                             ]
                         }