diff --git a/public/modules/forms/base/config/i18n/english.js b/public/modules/forms/base/config/i18n/english.js
index dc83635e..0b24dee8 100644
--- a/public/modules/forms/base/config/i18n/english.js
+++ b/public/modules/forms/base/config/i18n/english.js
@@ -4,25 +4,30 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 
   $translateProvider.translations('english', {
     FORM_SUCCESS: 'Form entry successfully submitted!',
+	SUBMIT: 'Submit',
+	REVIEW: 'Review',
     BACK_TO_FORM: 'Go back to Form',
 	EDIT_FORM: 'Edit this TellForm',
 	CREATE_FORM: 'Create this TellForm',
 	ADVANCEMENT: '{{done}} out of {{total}} answered',
 	CONTINUE_FORM: 'Continue to Form',
 	REQUIRED: 'required',
+	COMPLETING_NEEDED: '{{answers_not_completed}} answer(s) need completing',
 	OPTIONAL: 'optional',
 	ERROR_EMAIL_INVALID: 'Please enter a valid email address',
 	ERROR_NOT_A_NUMBER: 'Please enter valid numbers only',
 	ERROR_URL_INVALID: 'Please a valid url',
 	OK: 'OK',
 	ENTER: 'press ENTER',
+	YES: 'Yes',
+	NO: 'No',
+	NEWLINE: 'press SHIFT+ENTER to create a newline',
 	CONTINUE: 'Continue',
 	LEGAL_ACCEPT: 'I accept',
 	LEGAL_NO_ACCEPT: 'I don’t accept',
 	DELETE: 'Delete',
 	CANCEL: 'Cancel',
 	UPLOAD_FILE: 'Upload your File',
-	SUBMIT: 'Submit'
   });
 
   $translateProvider.preferredLanguage('english')
diff --git a/public/modules/forms/base/config/i18n/french.js b/public/modules/forms/base/config/i18n/french.js
index 3eaa31c7..0b980232 100644
--- a/public/modules/forms/base/config/i18n/french.js
+++ b/public/modules/forms/base/config/i18n/french.js
@@ -4,25 +4,30 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 
   $translateProvider.translations('french', {
     FORM_SUCCESS: 'Votre formulaire a été enregistré!',
+	REVIEW: 'Review',
     BACK_TO_FORM: 'Retourner au formulaire',
 	EDIT_FORM: 'Éditer le Tellform',
 	CREATE_FORM: 'Créer un TellForm',
 	ADVANCEMENT: '{{done}} complétés sur {{total}}',
 	CONTINUE_FORM: 'Aller au formulaire',
 	REQUIRED: 'obligatoire',
+	COMPLETING_NEEDED: '{{answers_not_completed}} réponse(s) doive(nt) être complétée(s)',
 	OPTIONAL: 'facultatif',
 	ERROR_EMAIL_INVALID: 'Merci de rentrer une adresse mail valide',
 	ERROR_NOT_A_NUMBER: 'Merce de ne rentrer que des nombres',
 	ERROR_URL_INVALID: 'Merci de rentrer une url valide',
 	OK: 'OK',
 	ENTER: 'presser ENTRÉE',
+	YES: 'Oui',
+	NO: 'Non',
+	NEWLINE: 'presser SHIFT+ENTER pour créer une nouvelle ligne',
 	CONTINUE: 'Continuer',
 	LEGAL_ACCEPT: 'J’accepte',
-	LEGAL_NO_ACCEPT: 'Jen n’accepte pas',
+	LEGAL_NO_ACCEPT: 'Je n’accepte pas',
 	DELETE: 'Supprimer',
 	CANCEL: 'Réinitialiser',
-	UPLOAD_FILE: 'Envoyer des fichier',
-	SUBMIT: 'Enregistrer'
+	SUBMIT: 'Enregistrer',
+	UPLOAD_FILE: 'Envoyer un fichier',
   });
 
 }]);
diff --git a/public/modules/forms/base/demo/boot.js b/public/modules/forms/base/demo/boot.js
index a9534c34..5d808911 100644
--- a/public/modules/forms/base/demo/boot.js
+++ b/public/modules/forms/base/demo/boot.js
@@ -8,7 +8,7 @@ angular.module('forms', [
 angular.module('NodeForm', [
     'ui.select', 'cgBusy', 'ngSanitize', 'vButton', 'ngResource',
     'ui.router', 'ui.bootstrap', 'ui.utils', 'ngRaven', 'forms',
-	'ui.select' 
+	'ui.select'
 ]);
 
 angular.module('forms').factory('Auth', [
diff --git a/public/modules/forms/base/demo/index.html b/public/modules/forms/base/demo/index.html
index 648b496a..61083082 100644
--- a/public/modules/forms/base/demo/index.html
+++ b/public/modules/forms/base/demo/index.html
@@ -39,7 +39,34 @@
 	</section>
 
 	<script>
-		window.form = {"_id":"571a76b856d64f9e4ca73ca1","lastModified":"2016-04-22T23:02:46.027Z","admin":{"_id":"571701290fff2042216c5b68","lastModified":"2016-04-20T04:10:38.421Z","email":"basliawo@fakeinbox.com","provider":"local","username":"basliawo@fakeinbox.com","__v":0,"created":"2016-04-20T04:10:17.008Z","language":"english","roles":["user"],"lastName":"Wo","firstName":"Baslia"},"title":"Job Application Example","__v":13,"created":"2016-04-21T21:00:01.686Z","plugins":{"oscarhost":{"settings":{"validFields":["address","city","email","firstName","hin","lastName","phone","postal","province","sex","spokenLanguage","title","DOB"],"validUpdateTypes":["upsert","force_add","force_update","fetch"]}}},"design":{"colors":{"buttonTextColor":"#5C780A","buttonColor":"#C5F044","answerColor":"#333","questionColor":"#6D8524","backgroundColor":"#E4F8A8"}},"autofillPDFs":false,"isLive":true,"isGenerated":false,"hideFooter":false,"startPage":{"buttons":[],"introButtonText":"Apply Now","introTitle":"We're looking for a great Growth Hacker","showStart":true},"submissions":[],"form_fields":[{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T23:02:46.019Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.016Z","title":"What's your last name?","fieldType":"textfield","fieldValue":"","_id":"57193fbb2aa1f3ff5e205b5a","created":"2016-04-21T21:01:47.132Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.017Z","title":"How would you rate your experience and knowledge of running split tests?","fieldType":"rating","fieldValue":1,"_id":"571940102aa1f3ff5e205b5d","created":"2016-04-21T21:03:12.644Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.017Z","title":"And how would you rate your creativity and ability to find innovative solutions?","fieldType":"rating","fieldValue":1,"_id":"571940222aa1f3ff5e205b5e","created":"2016-04-21T21:03:12.644Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Now, please read the following statement:  \"Finding the \"Aha!\" moment on the customer journey is the first and most important job of a growth hacker\"  What do you think of it?","fieldType":"radio","fieldValue":"","_id":"571940472aa1f3ff5e205b60","created":"2016-04-21T21:04:07.678Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[{"option_id":60612,"option_title":"Option 0","option_value":"1 (disagree)","_id":"571940632aa1f3ff5e205b61"},{"option_id":46890,"option_title":"Option 60612","option_value":"2","_id":"571940642aa1f3ff5e205b62"},{"option_id":14519,"option_title":"Option 46890","option_value":"3","_id":"5719406c2aa1f3ff5e205b63"},{"option_id":13374,"option_title":"Option 14519","option_value":"4","_id":"5719406f2aa1f3ff5e205b64"},{"option_id":88666,"option_title":"Option 13374","option_value":"5","_id":"571940722aa1f3ff5e205b65"},{"option_id":74204,"option_title":"Option 88666","option_value":"6 (agree)","_id":"571940822aa1f3ff5e205b66"}],"description":""},{"lastModified":"2016-04-22T23:02:46.019Z","title":"In this cross-functional role, you’ll be optimizing our users' journey across all stages of our marketing funnel.","fieldType":"statement","fieldValue":"","_id":"57193f562aa1f3ff5e205b58","created":"2016-04-21T21:00:06.998Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.021Z","title":"What about your ability to get things done quickly?","fieldType":"rating","fieldValue":1,"_id":"571940332aa1f3ff5e205b5f","created":"2016-04-21T21:03:12.644Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.021Z","title":"What's your first name?","fieldType":"textfield","fieldValue":"","_id":"57193fa92aa1f3ff5e205b59","created":"2016-04-21T21:01:29.219Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.021Z","title":"Can you tell us more about your choice?","fieldType":"textarea","fieldValue":"","_id":"571940932aa1f3ff5e205b67","created":"2016-04-21T21:05:23.928Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.023Z","title":"What growth hack have you done that you're most proud of?","fieldType":"textarea","fieldValue":"","_id":"571940b12aa1f3ff5e205b68","created":"2016-04-21T21:05:23.928Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.023Z","title":"Now, some quick reasoning test questions...","fieldType":"statement","fieldValue":"","_id":"571940c22aa1f3ff5e205b69","created":"2016-04-21T21:06:10.235Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Two students took an exam. One of them achieved 9 marks more than the other and his marks were 56% of the sum of both of their marks. What marks did they obtain?","fieldType":"radio","fieldValue":"","_id":"571940ea2aa1f3ff5e205b6a","created":"2016-04-21T21:06:50.729Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[{"option_id":45860,"option_title":"Option 0","option_value":"42 and 33","_id":"571941022aa1f3ff5e205b6b"},{"option_id":84531,"option_title":"Option 45860","option_value":"41 and 32","_id":"571941032aa1f3ff5e205b6c"},{"option_id":88832,"option_title":"Option 84531","option_value":"39 and 30","_id":"5719410d2aa1f3ff5e205b6d"},{"option_id":39666,"option_title":"Option 88832","option_value":"43 and 34","_id":"571941172aa1f3ff5e205b6e"}],"description":""},{"lastModified":"2016-04-22T23:02:46.026Z","title":"Agnes, Pedro, Robert, Xavi, Santi and David are sitting in a row. Santi and David are in the centre. Agnes and Pedro are at the ends. Robert is sitting to the left of Agnes.  Who is to the right of Pedro?","fieldType":"radio","fieldValue":"","_id":"5719412c2aa1f3ff5e205b6f","created":"2016-04-21T21:06:50.729Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[{"option_id":45860,"option_title":"Option 0","option_value":"Agnes","_id":"571941022aa1f3ff5e205b6b"},{"option_id":84531,"option_title":"Option 45860","option_value":"Santi","_id":"571941032aa1f3ff5e205b6c"},{"option_id":88832,"option_title":"Option 84531","option_value":"Xavi","_id":"5719410d2aa1f3ff5e205b6d"},{"option_id":39666,"option_title":"Option 88832","option_value":"David","_id":"571941172aa1f3ff5e205b6e"}],"description":""},{"lastModified":"2016-04-22T23:02:46.024Z","title":"What makes you want to work at Cloud Metrics?","fieldType":"textarea","fieldValue":"","_id":"571941572aa1f3ff5e205b70","created":"2016-04-21T21:08:39.654Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Finally, what annual salary ($) are you looking for?","fieldType":"textfield","fieldValue":"","_id":"571941672aa1f3ff5e205b71","created":"2016-04-21T21:08:55.492Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Email2","fieldType":"email","fieldValue":"","_id":"571a80045b53e2c651f28804","created":"2016-04-22T19:48:20.733Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""}],"description":"","language":"english"}
+		window.form = {
+			"_id":"form_id",
+			"title":"Job Application Example",
+			"plugins":{"oscarhost":{"settings":{"validFields":["address","city","email","firstName","hin","lastName","phone","postal","province","sex","spokenLanguage","title","DOB"],"validUpdateTypes":["upsert","force_add","force_update","fetch"]}}},
+			"design":{
+				"colors":{
+					"buttonTextColor":"#5C780A",
+					"buttonColor":"#C5F044",
+					"answerColor":"#333",
+					"questionColor":"#6D8524",
+					"backgroundColor":"#E4F8A8"
+				}
+			},
+			"autofillPDFs":false,
+			"isLive":true,
+			"isGenerated":false,
+			"hideFooter":false,
+			"startPage":{
+				"buttons":[],
+				"introButtonText":"Apply Now",
+				"introTitle":"We're looking for a great Growth Hacker",
+				"showStart":true
+			},
+			"submissions":[],
+			"form_fields":[{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T23:02:46.019Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.016Z","title":"What's your last name?","fieldType":"textfield","fieldValue":"","_id":"57193fbb2aa1f3ff5e205b5a","created":"2016-04-21T21:01:47.132Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.017Z","title":"How would you rate your experience and knowledge of running split tests?","fieldType":"rating","fieldValue":1,"_id":"571940102aa1f3ff5e205b5d","created":"2016-04-21T21:03:12.644Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.017Z","title":"And how would you rate your creativity and ability to find innovative solutions?","fieldType":"rating","fieldValue":1,"_id":"571940222aa1f3ff5e205b5e","created":"2016-04-21T21:03:12.644Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"_id":"57193ffa2aa1f3ff5e205b5c","fieldValue":"no","fieldType":"textfield","title":"Can we get the link to your LinkedIn profile?","lastModified":"2016-04-22T19:48:42.690Z","created":"2016-04-21T21:02:50.583Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":true,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Now, please read the following statement:  \"Finding the \"Aha!\" moment on the customer journey is the first and most important job of a growth hacker\"  What do you think of it?","fieldType":"radio","fieldValue":"","_id":"571940472aa1f3ff5e205b60","created":"2016-04-21T21:04:07.678Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[{"option_id":60612,"option_title":"Option 0","option_value":"1 (disagree)","_id":"571940632aa1f3ff5e205b61"},{"option_id":46890,"option_title":"Option 60612","option_value":"2","_id":"571940642aa1f3ff5e205b62"},{"option_id":14519,"option_title":"Option 46890","option_value":"3","_id":"5719406c2aa1f3ff5e205b63"},{"option_id":13374,"option_title":"Option 14519","option_value":"4","_id":"5719406f2aa1f3ff5e205b64"},{"option_id":88666,"option_title":"Option 13374","option_value":"5","_id":"571940722aa1f3ff5e205b65"},{"option_id":74204,"option_title":"Option 88666","option_value":"6 (agree)","_id":"571940822aa1f3ff5e205b66"}],"description":""},{"lastModified":"2016-04-22T23:02:46.019Z","title":"In this cross-functional role, you’ll be optimizing our users' journey across all stages of our marketing funnel.","fieldType":"statement","fieldValue":"","_id":"57193f562aa1f3ff5e205b58","created":"2016-04-21T21:00:06.998Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.021Z","title":"What about your ability to get things done quickly?","fieldType":"rating","fieldValue":1,"_id":"571940332aa1f3ff5e205b5f","created":"2016-04-21T21:03:12.644Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.021Z","title":"What's your first name?","fieldType":"textfield","fieldValue":"","_id":"57193fa92aa1f3ff5e205b59","created":"2016-04-21T21:01:29.219Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.021Z","title":"Can you tell us more about your choice?","fieldType":"textarea","fieldValue":"","_id":"571940932aa1f3ff5e205b67","created":"2016-04-21T21:05:23.928Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.023Z","title":"What growth hack have you done that you're most proud of?","fieldType":"textarea","fieldValue":"","_id":"571940b12aa1f3ff5e205b68","created":"2016-04-21T21:05:23.928Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.023Z","title":"Now, some quick reasoning test questions...","fieldType":"statement","fieldValue":"","_id":"571940c22aa1f3ff5e205b69","created":"2016-04-21T21:06:10.235Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Two students took an exam. One of them achieved 9 marks more than the other and his marks were 56% of the sum of both of their marks. What marks did they obtain?","fieldType":"radio","fieldValue":"","_id":"571940ea2aa1f3ff5e205b6a","created":"2016-04-21T21:06:50.729Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[{"option_id":45860,"option_title":"Option 0","option_value":"42 and 33","_id":"571941022aa1f3ff5e205b6b"},{"option_id":84531,"option_title":"Option 45860","option_value":"41 and 32","_id":"571941032aa1f3ff5e205b6c"},{"option_id":88832,"option_title":"Option 84531","option_value":"39 and 30","_id":"5719410d2aa1f3ff5e205b6d"},{"option_id":39666,"option_title":"Option 88832","option_value":"43 and 34","_id":"571941172aa1f3ff5e205b6e"}],"description":""},{"lastModified":"2016-04-22T23:02:46.026Z","title":"Agnes, Pedro, Robert, Xavi, Santi and David are sitting in a row. Santi and David are in the centre. Agnes and Pedro are at the ends. Robert is sitting to the left of Agnes.  Who is to the right of Pedro?","fieldType":"radio","fieldValue":"","_id":"5719412c2aa1f3ff5e205b6f","created":"2016-04-21T21:06:50.729Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[{"option_id":45860,"option_title":"Option 0","option_value":"Agnes","_id":"571941022aa1f3ff5e205b6b"},{"option_id":84531,"option_title":"Option 45860","option_value":"Santi","_id":"571941032aa1f3ff5e205b6c"},{"option_id":88832,"option_title":"Option 84531","option_value":"Xavi","_id":"5719410d2aa1f3ff5e205b6d"},{"option_id":39666,"option_title":"Option 88832","option_value":"David","_id":"571941172aa1f3ff5e205b6e"}],"description":""},{"lastModified":"2016-04-22T23:02:46.024Z","title":"What makes you want to work at Cloud Metrics?","fieldType":"textarea","fieldValue":"","_id":"571941572aa1f3ff5e205b70","created":"2016-04-21T21:08:39.654Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Finally, what annual salary ($) are you looking for?","fieldType":"textfield","fieldValue":"","_id":"571941672aa1f3ff5e205b71","created":"2016-04-21T21:08:55.492Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":false,"fieldOptions":[],"description":""},{"lastModified":"2016-04-22T23:02:46.025Z","title":"Email2","fieldType":"email","fieldValue":"","_id":"571a80045b53e2c651f28804","created":"2016-04-22T19:48:20.733Z","validFieldTypes":["textfield","date","email","link","legal","url","textarea","statement","welcome","thankyou","file","dropdown","scale","rating","radio","checkbox","hidden","yes_no","natural","number"],"deletePreserved":false,"disabled":false,"required":true,"fieldOptions":[],"description":""}],
+			"description":"",
+			"language":"french"
+		}
 	</script>
 
 	<script src='lib/jquery/dist/jquery.js'></script>
diff --git a/public/modules/forms/base/directives/submit-form.client.directive.js b/public/modules/forms/base/directives/submit-form.client.directive.js
index 440fc997..043ee96d 100644
--- a/public/modules/forms/base/directives/submit-form.client.directive.js
+++ b/public/modules/forms/base/directives/submit-form.client.directive.js
@@ -18,9 +18,12 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
                     }
                     return true;
                 }).length;
+
+				var nb_valid = $filter('formValidity')($scope.myform);
 				$scope.translateAdvancementData = {
-					done: $filter('formValidity')($scope.myform),
-					total: form_fields_count
+					done: nb_valid,
+					total: form_fields_count,
+					answers_not_completed: form_fields_count - nb_valid
 				};
 
                 $scope.reloadForm = function(){
@@ -114,9 +117,11 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
                     $scope.selected._id = field_id;
                     $scope.selected.index = field_index;
 
+					var nb_valid = $filter('formValidity')($scope.myform);
 					$scope.translateAdvancementData = {
-						done: $filter('formValidity')($scope.myform),
-						total: form_fields_count
+						done: nb_valid,
+						total: form_fields_count,
+						answers_not_completed: form_fields_count - nb_valid
 					};
 
                     if(animateScroll){
diff --git a/public/modules/forms/base/views/directiveViews/field/legal.html b/public/modules/forms/base/views/directiveViews/field/legal.html
index 04fff652..0ee6e101 100644
--- a/public/modules/forms/base/views/directiveViews/field/legal.html
+++ b/public/modules/forms/base/views/directiveViews/field/legal.html
@@ -31,7 +31,7 @@
 				<div class="letter" style="float:left">
 					Y
 				</div>
-                <span> {{ 'LEGAL_ACCEPT' | translate }} </span>
+                <span>{{ 'LEGAL_ACCEPT' | translate }}</span>
             </label>
             <label class="btn col-md-5 col-md-offset-1 col-xs-12"
 				   ng-class="{activeBtn: field.fieldValue == 'false'}">
@@ -46,7 +46,7 @@
 				<div class="letter" style="float:left">
 					N
 				</div>
-                <span>{{ 'LEGAL_NO_ACCEPT' | translate }} </span>
+                <span>{{ 'LEGAL_NO_ACCEPT' | translate }}</span>
             </label>
         </div>
 
diff --git a/public/modules/forms/base/views/directiveViews/field/textarea.html b/public/modules/forms/base/views/directiveViews/field/textarea.html
index 5280d88a..6214fea7 100755
--- a/public/modules/forms/base/views/directiveViews/field/textarea.html
+++ b/public/modules/forms/base/views/directiveViews/field/textarea.html
@@ -6,11 +6,9 @@
 				<i class="fa fa-angle-double-right" aria-hidden="true"></i>
 			</small>
 			{{field.title}}
-			<span class="required-error" ng-show="!field.required">optional</span>
+			<span class="required-error" ng-show="!field.required">{{ 'OPTIONAL' | translate }}</span>
 		</h3>
-		<p>
-			<small>{{field.description}}</small>
-		</p>
+		<small>{{ 'NEWLINE' | translate }}</small>
 	</div>
 	<div class="col-xs-12 field-input">
 		<small style="font-size:0.6em;">Press SHIFT+ENTER to add a newline</small>
diff --git a/public/modules/forms/base/views/directiveViews/field/yes_no.html b/public/modules/forms/base/views/directiveViews/field/yes_no.html
index 244d8d4b..4ebfe0dc 100644
--- a/public/modules/forms/base/views/directiveViews/field/yes_no.html
+++ b/public/modules/forms/base/views/directiveViews/field/yes_no.html
@@ -34,7 +34,7 @@
 				<div class="letter">
 					Y
 				</div>
-				<span>Yes</span>
+				<span>{{ 'YES' | translate }}</span>
 				<i ng-show="field.fieldValue === 'true'" class="fa fa-check" aria-hidden="true"></i>
             </label>
 	</div>
@@ -61,7 +61,7 @@
 			<div class="letter">
 				N
 			</div>
-			<span>No</span>
+			<span>{{ 'NO' | translate }}</span>
                 	<i ng-show="field.fieldValue === 'false'" class="fa fa-check" aria-hidden="true"></i>
             </label>
         </div>
diff --git a/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html b/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
index 53495188..c2f44b26 100755
--- a/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
+++ b/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
@@ -71,6 +71,7 @@ ng-style="{'color':button.color}">
 	<div class="col-xs-12 text-left"
 		 style="background-color:#990000; color:white;"
 		 ng-if="forms.myForm.$invalid">
+         {{ 'COMPLETING_NEEDED' | translate:translateAdvancementData }}
 		{{form_fields_count - (myform | formValidity)}} answer(s) need completing
 	</div>
 
@@ -93,7 +94,7 @@ ng-style="{'color':button.color}">
 			on-enter-key="goToInvalid()"
 			on-enter-key-disabled="!forms.myForm.$invalid"
 			style="font-size: 1.6em; margin-left: 1em; margin-top: 1em; background-color:#990000; color:white">
-		Review
+		{{ 'REVIEW' | translate }}
 	</button>
 
 	<div class="col-sm-2 hidden-xs" style="font-size: 75%; margin-top:3.25em">