diff --git a/src/common/apis/formTranslationApi.js b/src/common/apis/formTranslationApi.js
index eca3aafc..4d758583 100644
--- a/src/common/apis/formTranslationApi.js
+++ b/src/common/apis/formTranslationApi.js
@@ -11,3 +11,14 @@ export function translationsFor(formName, formVersion, locale, formUuid) {
 export function saveTranslations(translations) {
   return httpInterceptor.post(formBuilderConstants.saveTranslationsUrl, translations);
 }
+
+export function saveFormNameTranslations(nameTranslations, referenceUuid) {
+  return httpInterceptor.post(new UrlHelper()
+    .bahmniSaveFormNameTranslateUrl(referenceUuid), nameTranslations);
+}
+
+
+export function getFormNameTranslations(formName, formUuid) {
+  return httpInterceptor.get(new UrlHelper()
+      .bahmniFormNameTranslateUrl(formName, formUuid), 'text');
+}
diff --git a/src/form-builder/actions/control.js b/src/form-builder/actions/control.js
index 5858710e..403cef25 100644
--- a/src/form-builder/actions/control.js
+++ b/src/form-builder/actions/control.js
@@ -11,7 +11,7 @@ export const addSourceMap = (sourceMap) => ({ type: 'ADD_SOURCE_MAP', sourceMap
 export const setChangedProperty = (property, id) =>
   ({ type: 'SET_CHANGED_PROPERTY', property, id });
 
-export const sourceChangedProperty = (source) => ({ type: 'SOURCE_CHANGED', source });
+export const sourceChangedProperty = (source, id) => ({ type: 'SOURCE_CHANGED', source, id });
 
 export const dragSourceUpdate = (cell) => ({ type: 'DRAG_SOURCE_CHANGED', cell });
 
@@ -35,3 +35,9 @@ export const removeLocaleTranslation =
   (locale) => ({ type: 'REMOVE_LOCALE_TRANSLATIONS', locale });
 
 export const clearTranslations = () => ({ type: 'CLEAR_TRANSLATIONS' });
+
+export const formConditionsEventUpdate = (events) => ({ type: 'FORM_CONDITIONS_CHANGED', events });
+
+export const formLoad = (controls) => ({ type: 'FORM_LOAD', controls });
+
+export const deleteControl = (id) => ({ type: 'DELETE_CONTROL', id });
diff --git a/src/form-builder/components/ControlReduxWrapper.jsx b/src/form-builder/components/ControlReduxWrapper.jsx
index ef6c8a39..5b8efc3c 100644
--- a/src/form-builder/components/ControlReduxWrapper.jsx
+++ b/src/form-builder/components/ControlReduxWrapper.jsx
@@ -152,6 +152,7 @@ export class ControlWrapper extends Draggable {
           controlId={this.props.metadata.id}
           controlName={this.props.metadata.name}
           deleteControl={this.props.deleteControl}
+          dispatch={this.props.dispatch}
         />
       );
     }
diff --git a/src/form-builder/components/DeleteControlModal.jsx b/src/form-builder/components/DeleteControlModal.jsx
index c2e3097a..f36fa381 100644
--- a/src/form-builder/components/DeleteControlModal.jsx
+++ b/src/form-builder/components/DeleteControlModal.jsx
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { deleteControl } from 'form-builder/actions/control';
 
 export default class DeleteControlModal extends Component {
 
@@ -7,6 +8,7 @@ export default class DeleteControlModal extends Component {
     e.preventDefault();
     this.props.deleteControl(this.props.controlId);
     this.props.closeModal();
+    this.props.dispatch(deleteControl(this.props.controlId));
   }
 
   handleEsc(e) {
@@ -45,4 +47,5 @@ DeleteControlModal.propTypes = {
   controlId: PropTypes.string,
   controlName: PropTypes.string,
   deleteControl: PropTypes.func.isRequired,
+  dispatch: PropTypes.func.isRequired,
 };
diff --git a/src/form-builder/components/FormBuilder.jsx b/src/form-builder/components/FormBuilder.jsx
index 208de9bf..55889116 100644
--- a/src/form-builder/components/FormBuilder.jsx
+++ b/src/form-builder/components/FormBuilder.jsx
@@ -15,12 +15,12 @@ import { saveAs } from 'file-saver';
 import NotificationContainer from 'common/Notification';
 import { remove } from 'lodash';
 import Spinner from 'common/Spinner';
-
+import { formEventUpdate, saveEventUpdate } from 'form-builder/actions/control';
 
 export default class FormBuilder extends Component {
 
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
     this.state = { showModal: false, selectedForms: [], notification: {}, loading: false };
     this.setState = this.setState.bind(this);
 
@@ -32,6 +32,7 @@ export default class FormBuilder extends Component {
     this.formConceptValidationResults = {};
     this.handleSelectedForm = this.handleSelectedForm.bind(this);
     this.parseErrorMessage = 'Parse Error While Importing.. Please import a valid form';
+    this.clearEventEditors();
   }
 
   getFormVersion(formName) {
@@ -88,6 +89,11 @@ export default class FormBuilder extends Component {
     return validJsonFiles;
   }
 
+  clearEventEditors() {
+    this.props.dispatch(saveEventUpdate(''));
+    this.props.dispatch(formEventUpdate(''));
+  }
+
   validateAndLoadZipFile(jsonZip) {
     const self = this;
     const maxAllowedSize = 5 * 1024 * 1024;
@@ -221,6 +227,7 @@ export default class FormBuilder extends Component {
     const { formJson, translations } = formData;
     const formName = formJson.name;
     const value = JSON.parse(formJson.resources[0].value);
+    const nameTranslations = formJson.resources[1] && formJson.resources[1].value;
     const form = {
       name: formName,
       version: '1',
@@ -239,7 +246,7 @@ export default class FormBuilder extends Component {
           });
           self.updateImportErrors(fileName, message);
         } else {
-          self.formJSONs.push({ form, value, formName, translations });
+          self.formJSONs.push({ form, value, formName, translations, nameTranslations });
         }
       });
     }
@@ -271,15 +278,16 @@ export default class FormBuilder extends Component {
     const self = this;
     const importFormJsonPromises = [];
     formJsons.forEach(formJson => {
-      const { form, value, formName, translations } = formJson;
-      importFormJsonPromises.push(self.saveFormJson(form, value, formName, translations));
+      const { form, value, formName, translations, nameTranslations } = formJson;
+      importFormJsonPromises.push(self.saveFormJson(form, value, formName, translations,
+        nameTranslations));
     });
     Promise.all(importFormJsonPromises)
       .then(() => self.hideLoader())
       .catch(() => self.hideLoader());
   }
 
-  saveFormJson(form, value, formName, translations) {
+  saveFormJson(form, value, formName, translations, nameTranslations) {
     const self = this;
     const val = value;
     return httpInterceptor.post(formBuilderConstants.formUrl, form).then((response) => {
@@ -292,9 +300,18 @@ export default class FormBuilder extends Component {
         value: JSON.stringify(value),
         uuid: '',
       };
-      const translationsWithFormUuid = translations.map((eachTranslation) => Object.assign({},
-        eachTranslation, { formUuid: response.uuid }));
-      self.props.saveFormResource(formResource, translationsWithFormUuid);
+      const formNameTranslationsResource = !!nameTranslations && {
+        form: {
+          name: formName,
+          uuid: response.uuid,
+        },
+        value: nameTranslations,
+        uuid: '',
+      };
+      const translationsWithFormUuid = translations.map((eachTranslation) =>
+        Object.assign({}, eachTranslation, { formUuid: response.uuid }));
+      self.props.saveFormResource(formResource, translationsWithFormUuid,
+        formNameTranslationsResource);
     })
       .catch(() => {
         const formUuid = self.getFormUuid(formName);
@@ -312,7 +329,15 @@ export default class FormBuilder extends Component {
             value: JSON.stringify(value),
             uuid: data.resources[0].uuid,
           };
-          self.props.saveFormResource(formResource, translations);
+          const formNameTranslationsResource = !!nameTranslations && {
+            form: {
+              name: formName,
+              uuid: formUuid,
+            },
+            value: nameTranslations,
+            uuid: '',
+          };
+          self.props.saveFormResource(formResource, translations, formNameTranslationsResource);
         });
       });
   }
@@ -479,6 +504,7 @@ export default class FormBuilder extends Component {
 
 FormBuilder.propTypes = {
   data: PropTypes.array.isRequired,
+  dispatch: PropTypes.func.isRequired,
   match: PropTypes.shape({
     path: PropTypes.string.isRequired,
     url: PropTypes.string.isRequired,
diff --git a/src/form-builder/components/FormBuilderContainer.jsx b/src/form-builder/components/FormBuilderContainer.jsx
index 05e0e4c1..ad5e68d4 100644
--- a/src/form-builder/components/FormBuilderContainer.jsx
+++ b/src/form-builder/components/FormBuilderContainer.jsx
@@ -12,7 +12,7 @@ import sortBy from 'lodash/sortBy';
 import formHelper from '../helpers/formHelper';
 import { connect } from 'react-redux';
 import { setDefaultLocale } from '../actions/control';
-import { saveTranslations } from 'common/apis/formTranslationApi';
+import { saveFormNameTranslations, saveTranslations } from 'common/apis/formTranslationApi';
 
 
 export class FormBuilderContainer extends Component {
@@ -103,21 +103,23 @@ export class FormBuilderContainer extends Component {
     }
   }
 
-  saveTranslations(translations) {
+  saveTranslations(translations, formNameTranslations) {
     const self = this;
     self.setMessage('Importing Translations...', commonConstants.responseType.success);
-    saveTranslations(translations || [])
-      .then(() => {
-        self.getFormData();
-        self.setMessage('Imported Successfully',
-          commonConstants.responseType.success);
-      })
-      .catch(() => {
-        this.setMessage('Error Importing Translations', commonConstants.responseType.error);
-      });
+    const translationsPromises = [saveTranslations(translations || [])];
+    if (formNameTranslations) {
+      translationsPromises.push(saveFormNameTranslations(formNameTranslations, null));
+    }
+
+    Promise.all(translationsPromises).then(() => {
+      self.getFormData();
+      self.setMessage('Imported Successfully', commonConstants.responseType.success);
+    }).catch(() => {
+      this.setMessage('Error Importing Translations', commonConstants.responseType.error);
+    });
   }
 
-  saveFormResource(formJson, formTranslations) {
+  saveFormResource(formJson, formTranslations, formNameTranslationsResource) {
     const self = this;
     self.setMessage('Importing Form...', commonConstants.responseType.success);
     httpInterceptor.post(formBuilderConstants.bahmniFormResourceUrl, formJson)
@@ -127,7 +129,7 @@ export class FormBuilderContainer extends Component {
           formTranslation.version = form.form.version || translation.version;
           return formTranslation;
         });
-        self.saveTranslations(updatedTranslations);
+        self.saveTranslations(updatedTranslations, formNameTranslationsResource);
       })
       .catch(() => {
         this.setMessage('Error Importing Form', commonConstants.responseType.error);
@@ -143,12 +145,13 @@ export class FormBuilderContainer extends Component {
         />
         <FormBuilder
           data={this.state.data}
+          dispatch={this.props.dispatch}
           match={this.props.match}
           onValidationError={(messages) => this.onValidationError(messages)}
           routes={this.props.routes}
           saveForm={(formName) => this.saveForm(formName)}
-          saveFormResource={(formJson, translations) =>
-            this.saveFormResource(formJson, translations)}
+          saveFormResource={(formJson, translations, nameTranslations) =>
+            this.saveFormResource(formJson, translations, nameTranslations)}
         />
       </div>
     );
diff --git a/src/form-builder/components/FormConditionsModal.js b/src/form-builder/components/FormConditionsModal.js
new file mode 100644
index 00000000..b9687d94
--- /dev/null
+++ b/src/form-builder/components/FormConditionsModal.js
@@ -0,0 +1,118 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import ObsControlScriptEditorModal from 'form-builder/components/ObsControlScriptEditorModal';
+
+export default class FormConditionsModal extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { selectedControlEventTitleId: undefined,
+      selectedControlEventTitleName: undefined, selectedControlScript: undefined };
+    this.selectedControlOption = undefined;
+    this.selectedControlTitleId = undefined;
+    this.selectedControlTitleName = undefined;
+    this.selectedControlScript = undefined;
+    this.updateSelectedOption = this.updateSelectedOption.bind(this);
+  }
+
+  updateSelectedOption(element) {
+    this.selectedControlOption = element.target.value;
+    const selectedControlEventObj = this.props.controlEvents.find(control =>
+      control.id === this.selectedControlOption);
+    const selectedControlScriptObj = selectedControlEventObj ?
+      selectedControlEventObj.events : undefined;
+    this.selectedControlTitleId = selectedControlEventObj ? selectedControlEventObj.id : undefined;
+    this.selectedControlTitleName = selectedControlEventObj ? selectedControlEventObj.name :
+      undefined;
+    this.selectedControlScript = selectedControlScriptObj ?
+      selectedControlScriptObj.onValueChange : undefined;
+    this.setState({ selectedControlEventTitleId: this.selectedControlTitleId });
+    this.setState({ selectedControlEventTitleName: this.selectedControlTitleName });
+    this.setState({ selectedControlScript: this.selectedControlScript });
+  }
+
+  showObsControlScriptEditorModal(controlScript, controlEventTitleId, controlEventTitleName) {
+    if (controlEventTitleId !== undefined) {
+      return (<ObsControlScriptEditorModal
+        close={this.props.close}
+        script={controlScript}
+        titleId={controlEventTitleId}
+        titleName={controlEventTitleName}
+        updateScript={this.props.updateScript}
+      />
+      );
+    }
+    return null;
+  }
+  render() {
+    const obs = this.props.controlEvents !== undefined ? this.props.controlEvents : [];
+    const ObsWithControlEvents = obs.filter(o => o.events !== undefined);
+    const obsWithoutControlEvents = obs.filter(o => o.events === undefined);
+    const formDetailEvents = this.props.formDetails.events ? this.props.formDetails.events
+      : { onFormInit: undefined, onFormSave: undefined };
+    return (
+        <div className="form-conditions-modal-container">
+          <h2 className="header-title">{this.props.formTitle} - Form Conditions</h2>
+
+            <div className="left-panel" >
+              <br />
+              { this.showObsControlScriptEditorModal(formDetailEvents.onFormInit, null,
+                'Form Event')}
+              <br />
+              { this.showObsControlScriptEditorModal(formDetailEvents.onFormSave, null,
+                'Save Event')}
+              <br />
+            </div>
+            <div className="right-panel" >
+              <br />
+              <div>
+                <label className="label" >Control Events:</label>
+                <select className="obs-dropdown" onChange={this.updateSelectedOption}>
+                  <option key="0" value="0" >Select Option</option>)
+                  {obsWithoutControlEvents.map((e) =>
+                    <option key={e.id} value={e.id} >{e.name}</option>)}
+                </select>
+              </div>
+              <span className="line-break-3"></span>
+              <div>
+                {
+                  ObsWithControlEvents.map((e) =>
+                  this.showObsControlScriptEditorModal(e.events.onValueChange, e.id, e.name)
+                  )
+                }
+              </div>
+              {
+                <div> {this.showObsControlScriptEditorModal(this.state.selectedControlScript,
+                  this.state.selectedControlEventTitleId, this.state.selectedControlEventTitleName)}
+                  <span className="line-break-2"></span>
+                </div>
+              }
+            </div>
+
+          <div className="button-wrapper" >
+            <button className="btn" onClick={() => this.props.close()} type="reset">
+              Cancel
+            </button>
+          </div>
+
+        </div>
+    );
+  }
+}
+
+FormConditionsModal.propTypes = {
+  close: PropTypes.func.isRequired,
+  controlEvents: PropTypes.array,
+  formDetails: PropTypes.shape({
+    events: PropTypes.object,
+  }),
+  formTitle: PropTypes.string,
+  selectedControlEventTitleId: PropTypes.string,
+  selectedControlEventTitleName: PropTypes.string,
+  selectedControlScript: PropTypes.string,
+  updateScript: PropTypes.func.isRequired,
+};
+
+FormConditionsModal.defaultProps = {
+  formDetails: { events: {} },
+};
+
diff --git a/src/form-builder/components/FormDetail.jsx b/src/form-builder/components/FormDetail.jsx
index e2ef44bc..b99d1396 100644
--- a/src/form-builder/components/FormDetail.jsx
+++ b/src/form-builder/components/FormDetail.jsx
@@ -10,6 +10,8 @@ import FormHelper from 'form-builder/helpers/formHelper';
 import FormEventEditor from 'form-builder/components/FormEventEditor.jsx';
 import ScriptEditorModal from 'form-builder/components/ScriptEditorModal';
 import Popup from 'reactjs-popup';
+import FormConditionsModal from 'form-builder/components/FormConditionsModal';
+
 
 export default class FormDetail extends Component {
   constructor() {
@@ -17,15 +19,15 @@ export default class FormDetail extends Component {
     this.canvasRef = this.canvasRef.bind(this);
     this.canvas = undefined;
     window.onscroll = () => {
-      if (document.getElementsByClassName('column-side').length === 1) {
-        if (window.scrollY <= 62) {
-          const element = document.getElementsByClassName('column-side');
-          element[0].className = 'column-side';
-        }
-        if (window.scrollY >= 63 && window.scrollY <= 500) {
-          const element = document.getElementsByClassName('column-side');
-          element[0].className = 'column-side scrolled';
-        }
+      const getByClass = (elementClassName) => document.getElementsByClassName(elementClassName);
+      const isViewMode = getByClass('info-view-mode-wrap').length === 1;
+      const heightCheck = isViewMode ? 120 : 66;
+      const element = getByClass('column-side');
+      const isPresent = element.length === 1;
+      if (isPresent && window.scrollY > heightCheck) {
+        element[0].className = 'column-side scrolled';
+      } else {
+        element[0].className = 'column-side';
       }
     };
   }
@@ -68,7 +70,27 @@ export default class FormDetail extends Component {
       const FormEventEditorContent = (props) => {
         const script = props.property ? getScript(props.property, props.formDetails) : '';
         const showEditor = props.property && (props.property.formInitEvent
-          || props.property.formSaveEvent);
+          || props.property.formSaveEvent || props.property.formConditionsEvent);
+        if (!showEditor) {
+          return (<div></div>);
+        }
+        if (props.property.formConditionsEvent) {
+          return (<div>
+            {showEditor &&
+            <Popup className="form-event-popup" closeOnDocumentClick={false}
+              closeOnEscape={false}
+              open={showEditor} position="top center"
+            >
+              <FormConditionsModal
+                close={props.closeEventEditor}
+                controlEvents={props.formControlEvents}
+                formDetails={props.formDetails}
+                formTitle={this.formTitle(name, version, published, editable)}
+              />
+            </Popup>
+            }
+          </div>);
+        }
         return (<div>
           {showEditor &&
           <Popup className="form-event-popup" closeOnDocumentClick={false}
@@ -111,6 +133,12 @@ export default class FormDetail extends Component {
                                   label={'Save Event'}
                                   updateFormEvents={this.props.updateFormEvents}
                                 />
+                                <FormEventContainer
+                                  eventProperty={'formConditionsEvent'}
+                                  formTitle={this.props.formData.name}
+                                  label={'Form Conditions'}
+                                  updateFormEvents={this.props.updateFormEvents}
+                                />
                             </div>
                             <div className="container-column-main">
                                 <div className="column-main">
@@ -139,6 +167,7 @@ export default class FormDetail extends Component {
 
 FormDetail.propTypes = {
   defaultLocale: PropTypes.string,
+  formControlEvents: PropTypes.Array,
   formData: PropTypes.shape({
     id: PropTypes.number,
     name: PropTypes.string.isRequired,
@@ -148,6 +177,9 @@ FormDetail.propTypes = {
     version: PropTypes.string.isRequired,
     editable: PropTypes.bool,
   }),
+  formDetails: PropTypes.shape({
+    events: PropTypes.object,
+  }),
   setError: PropTypes.func.isRequired,
   updateFormEvents: PropTypes.func,
   updateFormName: PropTypes.func,
diff --git a/src/form-builder/components/FormDetailContainer.jsx b/src/form-builder/components/FormDetailContainer.jsx
index 0f3857f2..bb810278 100644
--- a/src/form-builder/components/FormDetailContainer.jsx
+++ b/src/form-builder/components/FormDetailContainer.jsx
@@ -7,7 +7,7 @@ import FormDetail from 'form-builder/components/FormDetail.jsx';
 import FormBuilderHeader from 'form-builder/components/FormBuilderHeader.jsx';
 import FormBuilderBreadcrumbs from 'form-builder/components/FormBuilderBreadcrumbs.jsx';
 import { connect } from 'react-redux';
-import { blurControl, deselectControl, removeControlProperties, removeSourceMap }
+import { blurControl, deselectControl, removeControlProperties, removeSourceMap, formLoad }
     from 'form-builder/actions/control';
 import NotificationContainer from 'common/Notification';
 import Spinner from 'common/Spinner';
@@ -18,22 +18,23 @@ import FormHelper from 'form-builder/helpers/formHelper';
 import formHelper from '../helpers/formHelper';
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
-import { clearTranslations, formEventUpdate, saveEventUpdate } from '../actions/control';
+import { clearTranslations } from '../actions/control';
+import { formEventUpdate, saveEventUpdate } from '../actions/control';
 import { Exception } from 'form-builder/helpers/Exception';
-import { saveTranslations } from 'common/apis/formTranslationApi';
+import { saveFormNameTranslations, saveTranslations } from 'common/apis/formTranslationApi';
 import FormPreviewModal from 'form-builder/components/FormPreviewModal.jsx';
 import Popup from 'reactjs-popup';
 
 
 export class FormDetailContainer extends Component {
-
   constructor(props) {
     super(props);
     this.timeoutId = undefined;
+    this.formJson = undefined;
     this.state = { formData: undefined, showModal: false, showPreview: false, notification: {},
-      httpReceived: false, loading: true, formList: [],
+      httpReceived: false, loading: true, formList: [], formControls: [],
       originalFormName: undefined, formEvents: {}, referenceVersion: undefined,
-      formPreviewJson: undefined };
+      referenceFormUuid: undefined, formPreviewJson: undefined };
     this.setState = this.setState.bind(this);
     this.setErrorMessage = this.setErrorMessage.bind(this);
     this.onSave = this.onSave.bind(this);
@@ -43,6 +44,7 @@ export class FormDetailContainer extends Component {
     this.cloneFormResource = this.cloneFormResource.bind(this);
     this.onPreview = this.onPreview.bind(this);
     this.generateFormPreviewJson = this.generateFormPreviewJson.bind(this);
+
     props.dispatch(deselectControl());
     props.dispatch(removeSourceMap());
     props.dispatch(removeControlProperties());
@@ -57,9 +59,15 @@ export class FormDetailContainer extends Component {
     httpInterceptor
             .get(`${formBuilderConstants.formUrl}/${this.props.match.params.formUuid}?${params}`)
             .then((data) => {
+              const parsedFormValue = data.resources.length > 0 ?
+                JSON.parse(data.resources[0].value) : {};
               this.setState({ formData: data, httpReceived: true,
-                loading: false, originalFormName: data.name, referenceVersion: data.version });
-              this.getFormJson();
+                loading: false, originalFormName: data.name,
+                referenceVersion: parsedFormValue.referenceVersion,
+                referenceFormUuid: parsedFormValue.referenceFormUuid });
+              this.formJson = this.getFormJson();
+              const formControlsArray = this.getObsControlEvents(this.formJson);
+              this.props.dispatch(formLoad(formControlsArray));
             })
             .catch((error) => {
               this.setErrorMessage(error);
@@ -70,6 +78,7 @@ export class FormDetailContainer extends Component {
     this.getFormList();
   }
 
+
   componentWillUpdate(nextProps, nextState) {
     if (!isEqual(nextProps, this.props) || !isEqual(nextState, this.state)) {
       this.props.dispatch(deselectControl());
@@ -107,6 +116,8 @@ export class FormDetailContainer extends Component {
       const formResourceUuid = this.state.formData && this.state.formData.resources.length > 0 ?
                 this.state.formData.resources[0].uuid : '';
       formJson.translationsUrl = formBuilderConstants.translationsUrl;
+      formJson.referenceVersion = this.state.referenceVersion;
+      formJson.referenceFormUuid = this.state.referenceFormUuid;
       const formResource = {
         form: {
           name: formName,
@@ -143,6 +154,28 @@ export class FormDetailContainer extends Component {
     this.generateFormPreviewJson();
   }
 
+
+  getObsControlEvents(control) {
+    let obsControlEvents = [];
+    if (control && control !== undefined && control.controls !== undefined) {
+      const childControls = control.controls;
+      const obsControls = childControls.filter(ctrl => ctrl.type === 'obsControl');
+      const nonObscontrols = childControls.filter(ctrl => ctrl.type !== 'obsControl');
+
+      nonObscontrols.forEach(ctrl => {
+        if (ctrl.controls !== undefined) {
+          const childObsControlEvents = this.getObsControlEvents(ctrl);
+          if (childObsControlEvents && childObsControlEvents !== undefined) {
+            obsControlEvents = obsControlEvents.concat(childObsControlEvents);
+          }
+        }
+      });
+      obsControlEvents = obsControlEvents.concat(obsControls.map(ctrl =>
+        ({ id: ctrl.id, name: ctrl.concept.name, events: ctrl.events })));
+    }
+    return obsControlEvents;
+  }
+
   getFormJson() {
     if (this.formDetail) {
       return this.formDetail.getFormJson();
@@ -194,8 +227,9 @@ export class FormDetailContainer extends Component {
   _createTranslationReqObject(container, locale) {
     const { version, name, uuid } = this.state.formData;
     const referenceVersion = this.state.referenceVersion;
+    const referenceFormUuid = this.state.referenceFormUuid;
     const translations = Object.assign({}, container, { formUuid: uuid,
-      formName: name, version, locale, referenceVersion });
+      formName: name, version, locale, referenceVersion, referenceFormUuid });
     return [translations];
   }
 
@@ -285,7 +319,9 @@ export class FormDetailContainer extends Component {
             { editable: true }
         );
     this.props.dispatch(clearTranslations());
-    this.setState({ formData: editableFormData });
+    this.setState({ formData: editableFormData,
+      referenceVersion: this.state.formData.version,
+      referenceFormUuid: this.state.formData.uuid });
   }
 
   generateFormPreviewJson() {
@@ -310,7 +346,7 @@ export class FormDetailContainer extends Component {
       position="top center"
     >
       <FormPreviewModal close={() => this.closePreview()}
-        formJson={this.state.formPreviewJson}
+        formJson={this.state.formPreviewJson} setErrorMessage={this.setErrorMessage}
       />
     </Popup>);
   }
@@ -341,7 +377,18 @@ export class FormDetailContainer extends Component {
 
   _saveTranslationsAndPublishForm(formUuid, translations) {
     this.setState({ loading: true });
-    saveTranslations(translations).then(() => {
+    const formNameTranslations = {
+      form: {
+        name: this.state.originalFormName,
+        uuid: this.props.match.params.formUuid,
+      }, value: '',
+    };
+    const translationsPromises = [saveTranslations(translations)];
+    if (this.state.referenceFormUuid && this.state.formData.version !== '1') {
+      translationsPromises.push(saveFormNameTranslations(formNameTranslations,
+        this.state.referenceFormUuid));
+    }
+    Promise.all(translationsPromises).then(() => {
       httpInterceptor.post(new UrlHelper().bahmniFormPublishUrl(formUuid))
         .then((response) => {
           const successNotification = {
@@ -465,7 +512,9 @@ export class FormDetailContainer extends Component {
                     {this.showPreviewModal()}
                   <FormDetail
                     defaultLocale={defaultLocale}
+                    formControlEvents={this.props.formControlEvents}
                     formData={this.state.formData}
+                    formDetails={this.props.formDetails}
                     ref={r => { this.formDetail = r; }}
                     setError={this.setErrorMessage}
                     updateFormEvents={(events) => this.updateFormEvents(events)}
@@ -482,6 +531,10 @@ export class FormDetailContainer extends Component {
 FormDetailContainer.propTypes = {
   defaultLocale: PropTypes.string,
   dispatch: PropTypes.func,
+  formControlEvents: PropTypes.array,
+  formDetails: PropTypes.shape({
+    events: PropTypes.object,
+  }),
   match: PropTypes.shape({
     path: PropTypes.string.isRequired,
     url: PropTypes.string.isRequired,
@@ -500,6 +553,8 @@ function mapStateToProps(state) {
   return {
     defaultLocale: state.formDetails && state.formDetails.defaultLocale,
     translations: state.translations,
+    formDetails: state.formDetails,
+    formControlEvents: state.controlDetails.allObsControlEvents,
   };
 }
 
diff --git a/src/form-builder/components/FormEventEditor.jsx b/src/form-builder/components/FormEventEditor.jsx
index 70bc3521..1ac16ceb 100644
--- a/src/form-builder/components/FormEventEditor.jsx
+++ b/src/form-builder/components/FormEventEditor.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { formEventUpdate, saveEventUpdate, setChangedProperty } from 'form-builder/actions/control';
-
+import { formEventUpdate, saveEventUpdate } from 'form-builder/actions/control';
+import { setChangedProperty, formConditionsEventUpdate } from 'form-builder/actions/control';
 export const FormEventEditor = (props) => {
-  const { property, formDetails, closeEventEditor } = props;
+  const { property, formDetails, closeEventEditor, formControlEvents } = props;
   const updateScript = (script) => {
     props.updateScript(script, property);
   };
@@ -12,7 +12,7 @@ export const FormEventEditor = (props) => {
   return (
     <div>
       {React.cloneElement(props.children, { property, formDetails, closeEventEditor,
-        updateScript })}
+        formControlEvents, updateScript })}
     </div>
   );
 };
@@ -20,15 +20,18 @@ export const FormEventEditor = (props) => {
 FormEventEditor.propTypes = {
   children: PropTypes.element.isRequired,
   closeEventEditor: PropTypes.func.isRequired,
+  formControlEvents: PropTypes.Array,
   formDetails: PropTypes.shape({
     events: PropTypes.shape({
       onFormInit: PropTypes.string,
       onFormSave: PropTypes.string,
+      onFormConditionsUpdate: PropTypes.string,
     }),
   }),
   property: PropTypes.shape({
     formInitEvent: PropTypes.bool,
     formSaveEvent: PropTypes.bool,
+    formConditionsEvent: PropTypes.bool,
   }),
   updateScript: PropTypes.func.isRequired,
 
@@ -36,20 +39,22 @@ FormEventEditor.propTypes = {
 
 const mapStateToProps = (state) => ({
   property: state.controlProperty ? state.controlProperty.property : undefined,
-  formDetails: state.formDetails,
+  formDetails: state.formDetails, formControlEvents: state.controlDetails.allObsControlEvents,
 });
 
 const mapDispatchToProps = (dispatch) => ({
   closeEventEditor: () => {
     dispatch(setChangedProperty({ formInitEvent: false }));
     dispatch(setChangedProperty({ formSaveEvent: false }));
+    dispatch(setChangedProperty({ formConditionsEvent: false }));
   },
   updateScript: (script, property) => {
-    const isSaveEvent = property.formSaveEvent;
-    if (isSaveEvent) {
+    if (property.formSaveEvent) {
       dispatch(saveEventUpdate(script));
-    } else {
+    } else if (property.formInitEvent) {
       dispatch(formEventUpdate(script));
+    } else if (property.formConditionsEvent) {
+      dispatch(formConditionsEventUpdate(script));
     }
   },
 });
diff --git a/src/form-builder/components/FormPreviewModal.jsx b/src/form-builder/components/FormPreviewModal.jsx
index 8bbcfaf5..8a0fd140 100644
--- a/src/form-builder/components/FormPreviewModal.jsx
+++ b/src/form-builder/components/FormPreviewModal.jsx
@@ -1,38 +1,58 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Container as Container } from 'bahmni-form-controls';
 import 'bahmni-form-controls/dist/helpers.js';
+import { Exception } from 'form-builder/helpers/Exception';
 
 
 export default class FormPreviewModal extends React.Component {
 
+  static formatErrors(error) {
+    if (Array.isArray(error)) {
+      return error.map(e => e.message || '[ERROR]').join(' | ');
+    }
+    return error.message || '[ERROR]';
+  }
+
   constructor(props) {
     super(props);
     this.state = {
       formData: {},
-      observations: [],
+      container: {},
+      defaultLocale: localStorage.getItem('openmrsDefaultLocale'),
     };
-    this.getContainer = this.getContainer.bind(this);
+    this.onSave = this.onSave.bind(this);
+    this.setContainer = this.setContainer.bind(this);
   }
 
-  getContainer(metadata) {
+  componentDidMount() {
+    this.setContainer([]);
+  }
+
+  onSave() {
+    const formJson = this.props.formJson;
+    if (this.state.container.state && formJson.events.onFormSave) {
+      /* eslint-disable no-undef */
+      try {
+        const records = runEventScript(this.state.container.state.data, formJson.events.onFormSave);
+        unMountForm(document.getElementById('form-container'));
+        this.setContainer(getObservations(records));
+      } catch (e) {
+        this.props.setErrorMessage(new Exception(FormPreviewModal.formatErrors(e)).getException());
+      }
+    }
+  }
+
+  setContainer(observations) {
+    const metadata = this.props.formJson;
     if (metadata) {
-      return (<Container
-        collapse={false}
-        metadata={metadata}
-        observations={this.state.observations}
-        patient={{}}
-        translations={{ labels: {}, concepts: {} }}
-        validate={false}
-        validateForm={false}
-      />);
+      const container = renderWithControls(metadata, observations, 'form-container', false, null,
+        false, this.state.defaultLocale, '');
+      this.setState({ container });
     }
-    return null;
   }
 
   render() {
     if (this.props.formJson) {
-      const metadata = this.props.formJson;
       return (
                 <div className="preview-container">
                     <div className="preview-header">
@@ -40,9 +60,14 @@ export default class FormPreviewModal extends React.Component {
                         <i className="fa fa-times" onClick={this.props.close}></i>
                     </div>
                     <div className="preview-body">
-                        {this.getContainer(metadata)}
+                      <div id="form-container"> </div>
                     </div>
                     <div className="preview-footer">
+                        <button className="button btn--highlight" onClick={this.onSave}
+                          type="submit"
+                        >
+                          Save
+                        </button>
                         <button className="btn preview-close-btn"
                           onClick={this.props.close}
                           type="reset"
@@ -59,4 +84,5 @@ export default class FormPreviewModal extends React.Component {
 FormPreviewModal.propTypes = {
   close: PropTypes.func.isRequired,
   formJson: PropTypes.object,
+  setErrorMessage: PropTypes.func.isRequired,
 };
diff --git a/src/form-builder/components/FormTranslationsContainer.jsx b/src/form-builder/components/FormTranslationsContainer.jsx
index 56fc09ab..cb808e95 100644
--- a/src/form-builder/components/FormTranslationsContainer.jsx
+++ b/src/form-builder/components/FormTranslationsContainer.jsx
@@ -16,7 +16,13 @@ import forEach from 'lodash/forEach';
 import map from 'lodash/map';
 import omit from 'lodash/omit';
 import { commonConstants } from 'common/constants';
-import { saveTranslations, translationsFor } from 'common/apis/formTranslationApi';
+import {
+  getFormNameTranslations,
+  saveFormNameTranslations,
+  saveTranslations,
+  translationsFor,
+} from 'common/apis/formTranslationApi';
+import { each } from 'lodash';
 
 
 class FormTranslationsContainer extends Component {
@@ -33,9 +39,13 @@ class FormTranslationsContainer extends Component {
     this.name = undefined;
     this.version = undefined;
     this.selectedLocale = undefined;
+    this.formNameTranslations = undefined;
     this._updateStore = this._updateStore.bind(this);
     this._saveTranslations = this._saveTranslations.bind(this);
     this._createTranslationReqObject = this._createTranslationReqObject.bind(this);
+    this._createNameTranslationReqObject = this._createNameTranslationReqObject.bind(this);
+    this._getFormNameTranslationsPromise = this._getFormNameTranslationsPromise.bind(this);
+    this._generateFormNameTranslationPayload = this._generateFormNameTranslationPayload.bind(this);
     this._getTranslations = this._getTranslations.bind(this);
     this._generateTranslation = this._generateTranslation.bind(this);
     props.dispatch(clearTranslations());
@@ -77,11 +87,27 @@ class FormTranslationsContainer extends Component {
 
   _getTranslations(name, version, locale, uuid) {
     this.setState({ loading: true });
-    translationsFor(name, version, locale, uuid)
-      .then((translations) => {
-        this._createInitialValue(translations, locale);
+    const getFormNameTranslationsPromise = this._getFormNameTranslationsPromise(name, uuid);
+    const getFormTranslationsPromise = translationsFor(name, version, locale, uuid);
+
+    Promise.all([getFormTranslationsPromise, getFormNameTranslationsPromise])
+      .then(translationsResponse => {
+        const formNameTranslationResponse = translationsResponse[1];
+        const formTranslationResponse = translationsResponse[0];
+        if (formNameTranslationResponse) {
+          this.formNameTranslations = formNameTranslationResponse;
+          const nameTranslationJSON = JSON.parse(formNameTranslationResponse.toString());
+          const nameTranslation = nameTranslationJSON.find(nameTranslationObj =>
+            locale === nameTranslationObj.locale);
+          formTranslationResponse.formNames = {
+            FORM_NAME: [nameTranslation && nameTranslation.display || name],
+          };
+        } else {
+          formTranslationResponse.formNames = { FORM_NAME: [name] };
+        }
+        this._createInitialValue(formTranslationResponse, locale);
         const { allowedLocales } = this.state;
-        const data = this._getTranslationsInfo(locale, translations, allowedLocales);
+        const data = this._getTranslationsInfo(locale, formTranslationResponse, allowedLocales);
         this.setState({ translationData: data, loading: false });
       }).catch(() => {
         const { allowedLocales } = this.state;
@@ -90,6 +116,12 @@ class FormTranslationsContainer extends Component {
       });
   }
 
+  _getFormNameTranslationsPromise(name, uuid) {
+    return this.formNameTranslations
+      ? Promise.resolve(this.formNameTranslations)
+      : getFormNameTranslations(name, uuid);
+  }
+
   _getTranslationsInfo(locale, selectedTranslations, allowedLocales) {
     const defaultLocale = localStorage.getItem('openmrsDefaultLocale');
     const headers = this._getHeaders(allowedLocales, locale, defaultLocale);
@@ -121,6 +153,7 @@ class FormTranslationsContainer extends Component {
   _createInitialValue(translations, locale) {
     this._updateStore(translations, 'concepts', locale);
     this._updateStore(translations, 'labels', locale);
+    this._updateStore(translations, 'formNames', locale);
   }
 
 
@@ -150,6 +183,36 @@ class FormTranslationsContainer extends Component {
   _saveTranslations() {
     this.setState({ loading: true });
     const { translations } = this.props;
+    saveFormNameTranslations(this._createNameTranslationReqObject(translations)).then(() => {
+      this.formNameTranslations = undefined;
+      this.setState({ loading: true });
+      this._getFormNameTranslationsPromise(this.name, this.props.match.params.formUuid)
+        .then(resp => {
+          this.formNameTranslations = resp;
+          const nameTranslationJSON = JSON.parse(resp.toString());
+          if (nameTranslationJSON) {
+            const updatedTranslationsData = map(this.state.translationData.data, translationObj => {
+              const translation = Object.assign({}, translationObj);
+              const nameTranslation = nameTranslationJSON.find(nameTranslationObj =>
+                translation.locale === nameTranslationObj.locale
+              );
+              if (nameTranslation) {
+                translation.formNames.FORM_NAME[0] = nameTranslation.display;
+              }
+              return translation;
+            });
+            this.setState({
+              translationsData: {
+                headers: this.state.translationData.headers,
+                data: updatedTranslationsData,
+              },
+            });
+          }
+        }).catch(() => {
+        }).finally(() => {
+          this.setState({ loading: false });
+        });
+    });
 
     saveTranslations(this._createTranslationReqObject(translations)).then(() => {
       const message = 'Form translations saved successfully';
@@ -161,14 +224,48 @@ class FormTranslationsContainer extends Component {
     });
   }
 
+  _createNameTranslationReqObject(translations) {
+    const formNameTranslations = this._generateFormNameTranslationPayload(translations);
+    return {
+      form: { name: this.name, uuid: this.props.match.params.formUuid },
+      value: JSON.stringify(formNameTranslations),
+    };
+  }
+
+  _generateFormNameTranslationPayload(translations) {
+    const formNameTranslationsObj = {};
+    each(translations, (localeTranslation, locale) => {
+      formNameTranslationsObj[locale] = localeTranslation.formNames.FORM_NAME;
+    });
+    if (this.formNameTranslations) {
+      const existingTranslations = JSON.parse(this.formNameTranslations);
+      each(existingTranslations, translation => {
+        if (!formNameTranslationsObj[translation.locale]) {
+          formNameTranslationsObj[translation.locale] = translation.display;
+        }
+      });
+    }
+
+    const formNameTranslationsList = [];
+    each(formNameTranslationsObj, (display, locale) => {
+      formNameTranslationsList.push({ display, locale });
+    });
+    return formNameTranslationsList;
+  }
+
   _createTranslationReqObject(translations) {
     const { name, version } = this;
-    return map(translations, (localeTranslation, locale) =>
-      Object.assign(localeTranslation, {
+    const translationObj = [];
+    each(translations, (localeTranslation, locale) => {
+      const localeTranslationCopy = Object.assign(Object.assign({}, localeTranslation), {
         formName: name,
         formUuid: this.props.match.params.formUuid,
         version, locale,
-      }));
+      });
+      delete localeTranslationCopy.formNames;
+      translationObj.push(localeTranslationCopy);
+    });
+    return translationObj;
   }
 
   _generateTranslation(element) {
diff --git a/src/form-builder/components/FormTranslationsGrid.jsx b/src/form-builder/components/FormTranslationsGrid.jsx
index 169d9d6f..a5bb3404 100644
--- a/src/form-builder/components/FormTranslationsGrid.jsx
+++ b/src/form-builder/components/FormTranslationsGrid.jsx
@@ -63,6 +63,7 @@ class FormTranslationsGrid extends Component {
               {this._getHeaders(this.props.translationData.headers)}
             </tr>
             </thead>
+            <tbody>{this.getRows('formNames')}</tbody>
             <tbody>{this.getRows('concepts')}</tbody>
             <tbody>{this.getRows('labels')}</tbody>
           </table>
diff --git a/src/form-builder/components/ObsControlScriptEditorModal.js b/src/form-builder/components/ObsControlScriptEditorModal.js
new file mode 100644
index 00000000..c89957f8
--- /dev/null
+++ b/src/form-builder/components/ObsControlScriptEditorModal.js
@@ -0,0 +1,93 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import CodeMirror from 'codemirror';
+import { JSHINT } from 'jshint';
+import 'codemirror/mode/javascript/javascript';
+import 'codemirror/lib/codemirror.js';
+import 'codemirror/lib/codemirror.css';
+import 'codemirror/mode/javascript/javascript.js';
+import 'codemirror/addon/lint/lint.js';
+import 'codemirror/addon/lint/lint.css';
+import 'codemirror/addon/lint/javascript-lint.js';
+import 'codemirror/addon/hint/show-hint.js';
+import 'codemirror/addon/hint/javascript-hint.js';
+import 'codemirror/addon/edit/closebrackets.js';
+
+window.JSHINT = JSHINT;
+
+export default class ObsControlScriptEditorModal extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { notification: {}, codeMirrorEditor: {} };
+    this.codeMirrorEditor = null;
+    this.scriptEditorTextArea = null;
+    this.prevScriptEditorTextArea = null;
+    this.setScriptEditorTextArea = element => {
+      this.scriptEditorTextArea = element;
+    };
+  }
+
+  componentDidMount() {
+    const scriptEditorTextArea = this.scriptEditorTextArea;
+    if (scriptEditorTextArea !== null) {
+      this.codeMirrorEditor = CodeMirror.fromTextArea(scriptEditorTextArea, {
+        mode: { name: 'javascript', globalVars: true },
+        autofocus: false,
+        autoCloseBrackets: true,
+        readOnly: true,
+        gutters: ['CodeMirror-lint-markers'],
+        lint: true,
+        extraKeys: { 'Ctrl-Space': 'autocomplete' },
+      });
+    }
+  }
+  componentDidUpdate() {
+    if (this.prevScriptEditorTextArea !== this.props.script) {
+      const script = this.props.script === undefined ? '' : this.props.script;
+      this.codeMirrorEditor.setValue(script);
+      this.prevScriptEditorTextArea = script;
+    }
+  }
+  getLabel() {
+    if (this.props.titleId === null) {
+      return (<label className="label-key" >{this.props.titleName}</label>);
+      // eslint-disable-next-line no-else-return
+    } else {
+      return (<div>
+        <label className="label-key" >Control Id: </label>
+        <label className="label-value" >{this.props.titleId}</label>
+        <label className="label-key" >Name: </label>
+        <label className="label-value" >{this.props.titleName}</label>
+      </div>);
+    }
+  }
+
+  render() {
+    if (this.props.titleId === undefined) {
+      return null;
+    }
+    // eslint-disable-next-line consistent-return
+    return (
+      <div className="control-modal">
+        {this.getLabel()}
+        <span className="line-break-1"></span>
+        <div className="text-div" >
+          <textarea autoFocus className="editor-wrapper area-height--textarea"
+            defaultValue={this.props.script} ref={this.setScriptEditorTextArea}
+          >
+          </textarea>
+        </div>
+        <span className="line-break-2"></span>
+      </div>
+    );
+  }
+}
+
+ObsControlScriptEditorModal.propTypes = {
+  close: PropTypes.func.isRequired,
+  script: PropTypes.string,
+  titleId: PropTypes.string,
+  titleName: PropTypes.string,
+  updateScript: PropTypes.func.isRequired,
+};
+
diff --git a/src/form-builder/constants.js b/src/form-builder/constants.js
index 9ccedbc3..c8c31f50 100644
--- a/src/form-builder/constants.js
+++ b/src/form-builder/constants.js
@@ -20,5 +20,6 @@ export const formBuilderConstants = {
   translationsUrl: '/openmrs/ws/rest/v1/bahmniie/form/translations',
   formTranslationUrl: '/openmrs/ws/rest/v1/bahmniie/form/translate',
   saveTranslationsUrl: '/openmrs/ws/rest/v1/bahmniie/form/saveTranslation',
+  saveNameTranslationsUrl: '/openmrs/ws/rest/v1/bahmniie/form/name/saveTranslation',
   exportUrl: '/openmrs/ws/rest/v1/bahmniie/form/export',
 };
diff --git a/src/form-builder/helpers/UrlHelper.js b/src/form-builder/helpers/UrlHelper.js
index f9bc01a6..f9e081b5 100644
--- a/src/form-builder/helpers/UrlHelper.js
+++ b/src/form-builder/helpers/UrlHelper.js
@@ -1,3 +1,5 @@
+import { formBuilderConstants } from 'form-builder/constants';
+
 export class UrlHelper {
   bahmniFormPublishUrl(uuid) {
     return `/openmrs/ws/rest/v1/bahmniie/form/publish?formUuid=${uuid}`;
@@ -12,4 +14,14 @@ export class UrlHelper {
     return '/openmrs/ws/rest/v1/bahmniie/form/translate?' +
       `formName=${formName}&formVersion=${formVersion}&locale=${locale}&formUuid=${formUuid}`;
   }
+
+  bahmniFormNameTranslateUrl(formName, formUuid) {
+    return '/openmrs/ws/rest/v1/bahmniie/form/name/translate?' +
+      `formName=${formName}&formUuid=${formUuid}`;
+  }
+
+  bahmniSaveFormNameTranslateUrl(referenceUuid) {
+    return formBuilderConstants.saveNameTranslationsUrl +
+      (referenceUuid ? `?referenceFormUuid=${referenceUuid}` : '');
+  }
 }
diff --git a/src/form-builder/reducers/controlDetails.js b/src/form-builder/reducers/controlDetails.js
index 5a00a23e..e7c53c6b 100644
--- a/src/form-builder/reducers/controlDetails.js
+++ b/src/form-builder/reducers/controlDetails.js
@@ -1,8 +1,23 @@
 import { cloneDeep } from 'lodash';
 const controlDetails = (store = {}, action) => {
   switch (action.type) {
+    // eslint-disable-next-line no-case-declarations
     case 'SELECT_CONTROL':
-      return Object.assign({}, store, { selectedControl: action.metadata });
+      let storeClone;
+      if (store.allObsControlEvents === undefined) {
+        storeClone = Object.assign({}, store, { allObsControlEvents: [{ id: action.metadata.id,
+          name: action.metadata.concept ? action.metadata.concept.name : undefined,
+          events: action.metadata.events }] });
+      } else {
+        storeClone = store;
+        storeClone.allObsControlEvents = storeClone.allObsControlEvents.filter(control =>
+          control.id !== action.metadata.id);
+        storeClone.allObsControlEvents = storeClone.allObsControlEvents.concat(
+          { id: action.metadata.id,
+            name: action.metadata.concept ? action.metadata.concept.name : undefined,
+            events: action.metadata.events });
+      }
+      return Object.assign({}, storeClone, { selectedControl: action.metadata });
     case 'DESELECT_CONTROL':
       return Object.assign({}, store, { selectedControl: undefined });
     case 'FOCUS_CONTROL':
@@ -10,9 +25,24 @@ const controlDetails = (store = {}, action) => {
     case 'BLUR_CONTROL':
       return Object.assign({}, store, { focusedControl: undefined });
     case 'SOURCE_CHANGED':
-      // eslint-disable-next-line
+      // eslint-disable-next-line no-param-reassign
       store.selectedControl.events = { onValueChange: action.source };
+      // eslint-disable-next-line no-param-reassign
+      store.allObsControlEvents = store.allObsControlEvents.map(control =>
+        (control.id === action.id ?
+          Object.assign({}, control, { events: { onValueChange: action.source } })
+          : control)
+      );
       return cloneDeep(store);
+    case 'FORM_LOAD':
+      return Object.assign({}, store, { allObsControlEvents: action.controls });
+
+    case 'DELETE_CONTROL':
+      storeClone = cloneDeep(store);
+      storeClone.allObsControlEvents = storeClone.allObsControlEvents.filter(control =>
+          control.id !== action.id);
+      return storeClone;
+
     case 'DRAG_SOURCE_CHANGED':
       return Object.assign({}, store, { dragSourceCell: action.cell });
 
diff --git a/src/form-builder/reducers/formDetails.js b/src/form-builder/reducers/formDetails.js
index bda1d5d4..de757a33 100644
--- a/src/form-builder/reducers/formDetails.js
+++ b/src/form-builder/reducers/formDetails.js
@@ -10,6 +10,11 @@ const formDetails = (store = {}, action) => {
         events: Object.assign({}, store.events,
           { onFormSave: action.events }),
       });
+    case 'FORM_CONDITIONS_CHANGED':
+      return Object.assign({}, store, {
+        events: Object.assign({}, store.events,
+          { onFormConditionsUpdate: action.events }),
+      });
     case 'SET_DEFAULT_LOCALE':
       return Object.assign({}, store, { defaultLocale: action.locale });
     default:
diff --git a/styles/common/_bahmniGlobal.scss b/styles/common/_bahmniGlobal.scss
index b44f605d..c0fb06e2 100644
--- a/styles/common/_bahmniGlobal.scss
+++ b/styles/common/_bahmniGlobal.scss
@@ -117,11 +117,25 @@ input[type="checkbox"] {
   width: 255px;
   float: left;
   margin-right: -100%;
+  height: 80%;
+  overflow: scroll;
+
+  &:not(.scrolled) {
+    @media screen and (max-height: 742px) {
+      max-height: 500px;
+    }
+    @media screen and (max-height: 642px) {
+      max-height: 472px;
+    }
+    @media screen and (max-height: 482px) {
+      max-height: 310px;
+    }
+  }
+
   &.scrolled {
     position: fixed;
-    top: 112px;
+    top: 96px;
   }
-
 }
 
 .container-column-main {
diff --git a/styles/common/_popUp.scss b/styles/common/_popUp.scss
index 9522e102..28a72bbf 100644
--- a/styles/common/_popUp.scss
+++ b/styles/common/_popUp.scss
@@ -11,7 +11,6 @@
   animation:.5s;
 }
 
-
 .dialog{
   @include box-shadow-for-section;
   position: fixed;
@@ -64,6 +63,11 @@
     margin: 0 10px 0 0;
   }
 
+  .CodeMirror-sizer{
+    width: 450px ;
+    min-width: 0 ;
+  }
+
   .script-editor-button-wrapper{
     background: #f7f7f7;
     padding: 10px;
@@ -82,6 +86,79 @@
   }
 }
 
+.form-conditions-modal-container{
+  height: 80vh;
+  border-radius: 5px 5px 0 0;
+  font-size: 13px;
+
+  .left-panel{
+    padding: 30px;
+    border-right: 1px solid #dddddd;
+    width: 40%;
+    float: left;
+    height: 90%;
+    overflow-y: auto;
+  }
+  .left-panel .CodeMirror{
+    height: 230px;
+  }
+  .right-panel{
+    padding: 30px;
+    margin-left: 40%;
+    height: 90%;
+    overflow-y: auto;
+  }
+  .right-panel .CodeMirror{
+    height: 155px;
+  }
+  .button-wrapper{
+    background: #f7f7f7;
+    padding: 10px;
+    text-align: right;
+    border-top: 1px solid #dddddd;
+  }
+  .label{
+    float: left;
+    font-weight: bolder;
+  }
+  .obs-dropdown{
+    float: right;
+  }
+}
+
+.control-modal{
+  padding-left: 10px;
+  .label{
+    font-weight: bolder;
+  }
+  .label-key{
+    font-weight: bolder;
+  }
+  .label-value{
+    margin-right: 50px;
+    font-weight: lighter;
+  }
+  .text-div{
+    border-style: solid;
+    border-width: thin;
+  }
+}
+
 .CodeMirror-lint-tooltip{
   z-index: 1002 !important; /* stylelint-disable-line declaration-no-important */
 }
+
+.line-break-1 {
+  display: block;
+  margin-bottom: 1em;
+}
+
+.line-break-2 {
+  display: block;
+  margin-bottom: 2em;
+}
+
+.line-break-3 {
+  display: block;
+  margin-bottom: 3em;
+}
diff --git a/test/common/formTranslationApi.spec.js b/test/common/formTranslationApi.spec.js
index 82899cfd..5ee699cb 100644
--- a/test/common/formTranslationApi.spec.js
+++ b/test/common/formTranslationApi.spec.js
@@ -3,7 +3,11 @@ import chai, { expect } from 'chai';
 import sinon from 'sinon';
 import { httpInterceptor } from 'common/utils/httpInterceptor';
 import { formBuilderConstants } from 'form-builder/constants';
-import { saveTranslations, translationsFor } from 'common/apis/formTranslationApi';
+import {
+  getFormNameTranslations, saveFormNameTranslations,
+  saveTranslations,
+  translationsFor,
+} from 'common/apis/formTranslationApi';
 import { UrlHelper } from 'form-builder/helpers/UrlHelper';
 
 chai.use(chaiEnzyme());
@@ -57,5 +61,63 @@ describe('formTranslationApi', () => {
       });
     });
   });
+
+  describe('save form name translation', () => {
+    beforeEach(() => {
+      sinon.stub(httpInterceptor, 'post').callsFake(() => Promise.resolve());
+    });
+    afterEach(() => {
+      httpInterceptor.post.restore();
+    });
+
+    it('should call save form name translations endpoint and return a promise', () => {
+      const translations = { form: { name: 'formName', uuid: 'formUuid' }, value: '' };
+      const saveTranslationPromise = saveFormNameTranslations(translations);
+      expect(saveTranslationPromise).not.to.eq(null);
+      saveTranslationPromise.then(() => {
+        sinon.assert.calledWith(
+          httpInterceptor.post,
+          formBuilderConstants.saveNameTranslationsUrl,
+          translations
+        );
+      });
+    });
+
+    it('should call save form name translations endpoint with reference form uuid ', () => {
+      const translations = { form: { name: 'formName', uuid: 'formUuid' }, value: '' };
+      const saveTranslationPromise = saveFormNameTranslations(translations, 'ref-uuid');
+      expect(saveTranslationPromise).not.to.eq(null);
+      saveTranslationPromise.then(() => {
+        sinon.assert.calledWith(
+          httpInterceptor.post,
+          `${formBuilderConstants.saveNameTranslationsUrl}?referenceFormUuid=ref-uuid`,
+          translations
+        );
+      });
+    });
+  });
+
+  describe('fetch form name translation', () => {
+    const nameTranslations = "[{ display: 'formName_en', locale: 'en'}]";
+    beforeEach(() => {
+      sinon.stub(httpInterceptor, 'get').callsFake(() => Promise.resolve(nameTranslations));
+    });
+    afterEach(() => {
+      httpInterceptor.get.restore();
+    });
+    it('should call form name translate endpoint and return a translations', () => {
+      const formName = 'formName';
+      const formUuid = 'formUuid';
+      const translatePromise = getFormNameTranslations(formName, formUuid);
+
+      expect(translatePromise).not.to.eq(null);
+      translatePromise.then(() => {
+        sinon.assert.calledWith(
+          httpInterceptor.get,
+          new UrlHelper().bahmniFormTranslateUrl(formName, formUuid)
+        );
+      });
+    });
+  });
 });
 
diff --git a/test/form-builder/actions/control.spec.js b/test/form-builder/actions/control.spec.js
index 28344d58..5d89f75b 100644
--- a/test/form-builder/actions/control.spec.js
+++ b/test/form-builder/actions/control.spec.js
@@ -89,10 +89,39 @@ describe('control', () => {
   describe('sourceChangedProperty', () => {
     it('should return the action and changed source', () => {
       const source = 'any thing';
-      const action = control.sourceChangedProperty(source);
-
+      const id = 1;
+      const action = control.sourceChangedProperty(source, id);
       expect(action.type).to.eql('SOURCE_CHANGED');
       expect(action.source).to.eql(source);
+      expect(action.id).to.eql(id);
+    });
+  });
+
+  describe('formConditionsEventUpdate', () => {
+    it('should return the events and changed source', () => {
+      const events = { onValueChange: "function(){console.log('test');}" };
+      const action = control.formConditionsEventUpdate(events);
+      expect(action.type).to.eql('FORM_CONDITIONS_CHANGED');
+      expect(action.events).to.eql(events);
+    });
+  });
+
+  describe('formLoad', () => {
+    it('should return the controls and changed source', () => {
+      const controls = [{ id: 1, name,
+        events: { onValueChange: "function(){console.log('test');}" } }];
+      const action = control.formLoad(controls);
+      expect(action.type).to.eql('FORM_LOAD');
+      expect(action.controls).to.eql(controls);
+    });
+  });
+
+  describe('deleteControl', () => {
+    it('should return the control id and action', () => {
+      const ctrl = { id: 1, name, events: undefined };
+      const action = control.deleteControl(ctrl.id);
+      expect(action.type).to.eql('DELETE_CONTROL');
+      expect(action.id).to.eql(ctrl.id);
     });
   });
 
diff --git a/test/form-builder/components/DeleteControlModal.spec.js b/test/form-builder/components/DeleteControlModal.spec.js
index a1fe8574..b404ac9a 100644
--- a/test/form-builder/components/DeleteControlModal.spec.js
+++ b/test/form-builder/components/DeleteControlModal.spec.js
@@ -12,18 +12,21 @@ describe('DeleteControlModal', () => {
   let wrapper;
   let closeModalSpy;
   let deleteControlSpy;
+  let dispatchSpy;
   let controlName;
   let controlId;
 
   beforeEach(() => {
     closeModalSpy = sinon.spy();
     deleteControlSpy = sinon.spy();
+    dispatchSpy = sinon.spy();
     wrapper = shallow(
       <DeleteControlModal
         closeModal={closeModalSpy}
         controlId={controlId}
         controlName={controlName}
         deleteControl={deleteControlSpy}
+        dispatch={dispatchSpy}
       />
     );
   });
@@ -60,5 +63,6 @@ describe('DeleteControlModal', () => {
 
     sinon.assert.calledWith(deleteControlSpy, controlId);
     sinon.assert.calledOnce(closeModalSpy);
+    sinon.assert.calledOnce(dispatchSpy);
   });
 });
diff --git a/test/form-builder/components/FormBuilder.spec.js b/test/form-builder/components/FormBuilder.spec.js
index 3806a166..dfd50aec 100644
--- a/test/form-builder/components/FormBuilder.spec.js
+++ b/test/form-builder/components/FormBuilder.spec.js
@@ -11,15 +11,21 @@ import { saveAs } from 'file-saver';
 import jsonpath from 'jsonpath/jsonpath';
 import * as FormBuilderBreadcrumbs from 'form-builder/components/FormBuilderBreadcrumbs.jsx';
 import { MemoryRouter } from 'react-router-dom';
+import { formEventUpdate, saveEventUpdate } from 'form-builder/actions/control';
+
 
 chai.use(chaiEnzyme());
 
 describe('FormBuilder', () => {
   let wrapper;
   const saveFormSpy = sinon.spy();
+  let dispatchSpy;
 
   beforeEach(() => {
-    wrapper = shallow(<FormBuilder data={[1, 2, 3]} saveForm={saveFormSpy} />);
+    dispatchSpy = sinon.spy();
+    wrapper = shallow(<FormBuilder data={[1, 2, 3]} dispatch={dispatchSpy}
+      saveForm={saveFormSpy}
+    />);
   });
 
   it('should render FormList', () => {
@@ -30,6 +36,13 @@ describe('FormBuilder', () => {
     expect(wrapper).to.have.exactly(1).descendants('CreateFormModal');
   });
 
+  it('should clear clear FormEvent and Save Event', () => {
+    sinon.assert.calledTwice(dispatchSpy);
+    sinon.assert.callOrder(dispatchSpy.withArgs(saveEventUpdate('')),
+      dispatchSpy.withArgs(formEventUpdate(''))
+    );
+  });
+
   it('should set state of showModal as true when create a form option is clicked', () => {
     const instance = wrapper.instance();
     expect(instance.state.showModal).to.eql(false);
@@ -81,6 +94,7 @@ describe('Import form', () => {
   let breadcrumbsStub;
   const saveFormSpy = sinon.spy();
   const saveFormResourceSpy = sinon.spy();
+  const dispatchSpy = sinon.spy();
   const file = [
     {
       lastModified: 1492756593000,
@@ -230,8 +244,8 @@ describe('Import form', () => {
 
   beforeEach(() => {
     breadcrumbsStub = sinon.stub(FormBuilderBreadcrumbs, 'default').returns(<div>A stub</div>);
-    wrapper = mount(<MemoryRouter><FormBuilder data={data} routes={routes} saveForm={saveFormSpy}
-      saveFormResource={saveFormResourceSpy}
+    wrapper = mount(<MemoryRouter><FormBuilder data={data} dispatch={dispatchSpy}
+      routes={routes} saveForm={saveFormSpy} saveFormResource={saveFormResourceSpy}
     /></MemoryRouter>);
   });
 
@@ -378,6 +392,7 @@ describe('Import form', () => {
         referenceFormUuid: null,
       },
     ];
+    formJson.nameTranslations = '{"display":"1_EN_Name", "locale": "en"}';
     sinon.stub(httpInterceptor, 'post').callsFake(() => {
       const response = data[0];
       return Promise.resolve(Object.assign({}, response, { uuid: 'new_uuid' }));
@@ -386,6 +401,7 @@ describe('Import form', () => {
     setTimeout(() => {
       const firstArgumentOfSaveFormResource = saveFormResourceSpy.getCall(0).args[0];
       const secondArgumentOfSaveFormResource = saveFormResourceSpy.getCall(0).args[1];
+      const thirdArgumentOfSaveFormResource = saveFormResourceSpy.getCall(0).args[2];
       sinon.assert.calledOnce(saveFormResourceSpy);
       expect(firstArgumentOfSaveFormResource.form.name).to.eq(data[0].name);
       expect(firstArgumentOfSaveFormResource.form.uuid).to.eq('new_uuid');
@@ -396,6 +412,10 @@ describe('Import form', () => {
       expect(secondArgumentOfSaveFormResource[0].version).to.eq(data[0].version);
       expect(secondArgumentOfSaveFormResource[0].formName).to.eq(data[0].name);
       expect(secondArgumentOfSaveFormResource[0].formUuid).to.eq('new_uuid');
+      expect(thirdArgumentOfSaveFormResource.form.name).to.eq(data[0].name);
+      expect(thirdArgumentOfSaveFormResource.form.uuid).to.eq('new_uuid');
+      expect(thirdArgumentOfSaveFormResource.value)
+        .to.eq('{"display":"1_EN_Name", "locale": "en"}');
       done();
     }, 500);
   });
@@ -406,8 +426,12 @@ describe('Export Forms', () => {
   const saveFormSpy = sinon.spy();
   let exportResponse;
   let mockHttp;
+  const dispatchSpy = sinon.spy();
+
   beforeEach(() => {
-    wrapper = shallow(<FormBuilder data={[1, 2, 3]} saveForm={saveFormSpy} />);
+    wrapper = shallow(<FormBuilder data={[1, 2, 3]} dispatch={dispatchSpy}
+      saveForm={saveFormSpy}
+    />);
     mockHttp = sinon.stub(httpInterceptor);
   });
 
@@ -497,11 +521,12 @@ describe('Import Multiple Forms', () => {
   const saveFormSpy = sinon.spy();
   let onValidationErrorSpy = sinon.spy();
   let newInstance;
+  const dispatchSpy = sinon.spy();
 
   beforeEach(() => {
     onValidationErrorSpy = sinon.spy();
-    wrapper = shallow(<FormBuilder data={[1, 2, 3]} onValidationError={onValidationErrorSpy}
-      saveForm={saveFormSpy}
+    wrapper = shallow(<FormBuilder data={[1, 2, 3]} dispatch={dispatchSpy}
+      onValidationError={onValidationErrorSpy} saveForm={saveFormSpy}
     />);
     newInstance = wrapper.instance();
     newInstance.resetValues();
@@ -820,7 +845,7 @@ describe('Import Multiple Forms', () => {
       formJson: {
         name: formName,
         resources: [
-          { value: '{"a":2}' },
+          { value: '{"a":2}' }, { value: '{"display":"sampleForm_EN", "locale": "en"}' },
         ],
       },
       translations: [],
@@ -832,6 +857,8 @@ describe('Import Multiple Forms', () => {
       expect(newInstance.formJSONs.length).to.eql(1);
       expect(newInstance.formJSONs[0].formName).to.eql(formName);
       expect(newInstance.formJSONs[0].translations).to.eql([]);
+      expect(newInstance.formJSONs[0].nameTranslations)
+        .to.eql('{"display":"sampleForm_EN", "locale": "en"}');
       done();
     });
   });
diff --git a/test/form-builder/components/FormConditionsModal.spec.js b/test/form-builder/components/FormConditionsModal.spec.js
new file mode 100644
index 00000000..ebd52a82
--- /dev/null
+++ b/test/form-builder/components/FormConditionsModal.spec.js
@@ -0,0 +1,172 @@
+import React from 'react';
+import chaiEnzyme from 'chai-enzyme';
+import chai, { expect } from 'chai';
+import { shallow } from 'enzyme';
+import sinon from 'sinon';
+import FormConditionsModal from 'form-builder/components/FormConditionsModal';
+chai.use(chaiEnzyme());
+
+describe('FormConditionsModal', () => {
+  let wrapper;
+  // eslint-disable-next-line no-unused-vars
+  let ObsControlScriptEditorModalStub;
+  let closeSpy;
+  let formControlEvents = [];
+  const formDetails = {};
+  const formTitle = 'form title';
+  const script = 'function(){}';
+
+  it('should render with passed title prop', () => {
+    wrapper = shallow(
+      <FormConditionsModal
+        close={() => {}}
+        controlEvents={formControlEvents}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+    expect(wrapper.find('.header-title').at(0).text()).to.eql(`${formTitle} - Form Conditions`);
+  });
+
+  it('should call showObsControlScriptEditorModal thrice with no observations ', () => {
+    wrapper = shallow(
+      <FormConditionsModal
+        close={() => {}}
+        controlEvents={formControlEvents}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+    const wrapperInstance = wrapper.instance();
+    sinon.stub(wrapperInstance, 'showObsControlScriptEditorModal');
+    wrapperInstance.render();
+    sinon.assert.calledThrice(wrapperInstance.showObsControlScriptEditorModal);
+    sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, null, 'Form Event');
+    sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, null, 'Save Event');
+    sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, undefined, undefined);
+
+    expect(wrapper.find('ObsControlScriptEditorModal').length).to.eq(2);
+  });
+
+  it('should call showObsControlScriptEditorModal thrice with observations which has no events'
+    , () => {
+      formControlEvents = [{ id: '1', name: 'obs1' }];
+      wrapper = shallow(
+      <FormConditionsModal
+        close={() => {}}
+        controlEvents={formControlEvents}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+      const wrapperInstance = wrapper.instance();
+      sinon.stub(wrapperInstance, 'showObsControlScriptEditorModal');
+      wrapperInstance.render();
+      sinon.assert.callCount(wrapperInstance.showObsControlScriptEditorModal, 3);
+      sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, null, 'Form Event');
+      sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, null, 'Save Event');
+      sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, undefined, undefined);
+      expect(wrapper.find('ObsControlScriptEditorModal').length).to.eq(2);
+    });
+
+  it('should call showObsControlScriptEditorModal thrice with  observations which has events',
+    () => {
+      formControlEvents = [{ id: '1', name: 'obs1', events: { onValueChange: 'func1(){}' } }];
+      wrapper = shallow(
+      <FormConditionsModal
+        close={() => {}}
+        controlEvents={formControlEvents}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+      const wrapperInstance = wrapper.instance();
+      sinon.stub(wrapperInstance, 'showObsControlScriptEditorModal');
+      wrapperInstance.render();
+      sinon.assert.callCount(wrapperInstance.showObsControlScriptEditorModal, 4);
+      sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, null, 'Form Event');
+      sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, null, 'Save Event');
+      // sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      //  formControlEvents[0].events, formControlEvents[0].id, formControlEvents[0].name);
+      sinon.assert.calledWith(wrapperInstance.showObsControlScriptEditorModal,
+      undefined, undefined, undefined);
+      expect(wrapper.find('ObsControlScriptEditorModal').length).to.eq(3);
+    });
+
+  it('should call closeSpy on click of format', () => {
+    closeSpy = sinon.spy();
+    wrapper = shallow(
+      <FormConditionsModal
+        close={closeSpy}
+        controlEvents={formControlEvents}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+    const saveButton = wrapper.find('.btn').at(0);
+    saveButton.simulate('click');
+    sinon.assert.calledOnce(closeSpy);
+  });
+
+  it('should rerender ObsControlScriptEditorModal on change  of obs dropdown', () => {
+    closeSpy = sinon.spy();
+    wrapper = shallow(
+      <FormConditionsModal
+        close={closeSpy}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+    expect(wrapper.find('.obs-dropdown option').length).to.eq(1);
+  });
+
+  it('should rerender ObsControlScriptEditorModal on change  of obs dropdown', () => {
+    closeSpy = sinon.spy();
+    formControlEvents = [{ id: '1', name: 'obs1', events: { onValueChange: 'func' } }];
+    wrapper = shallow(
+      <FormConditionsModal
+        close={closeSpy}
+        controlEvents={formControlEvents}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+    wrapper.find('.obs-dropdown').simulate('change', { target: { value: '1' } });
+    expect(wrapper.state('selectedControlEventTitleId')).to.eq(formControlEvents[0].id);
+    expect(wrapper.state('selectedControlEventTitleName')).to.eq(formControlEvents[0].name);
+    expect(wrapper.state('selectedControlScript')).to.eq(formControlEvents[0].events.onValueChange);
+  });
+
+  it('should not render ObsControlScriptEditorModal when obs dropdown set to select option', () => {
+    closeSpy = sinon.spy();
+    formControlEvents = [{ id: '1', name: 'obs1' }];
+    wrapper = shallow(
+      <FormConditionsModal
+        close={closeSpy}
+        controlEvents={formControlEvents}
+        formDetails={formDetails}
+        formTitle={formTitle}
+        script={script}
+        updateScript={() => {}}
+      />);
+    wrapper.find('.obs-dropdown').simulate('change', { target: { value: '0' } });
+    expect(wrapper.state('selectedControlEventTitleId')).to.eq(undefined);
+    expect(wrapper.state('selectedControlEventTitleName')).to.eq(undefined);
+    expect(wrapper.state('selectedControlScript')).to.eq(undefined);
+  });
+});
diff --git a/test/form-builder/components/FormDetail.spec.js b/test/form-builder/components/FormDetail.spec.js
index 0e4ed6aa..c39d254a 100644
--- a/test/form-builder/components/FormDetail.spec.js
+++ b/test/form-builder/components/FormDetail.spec.js
@@ -8,6 +8,7 @@ import { Provider } from 'react-redux';
 import { ComponentStore } from 'bahmni-form-controls';
 import sinon from 'sinon';
 import * as ScriptEditorModal from 'form-builder/components/ScriptEditorModal';
+import * as FormConditionsModal from 'form-builder/components/FormConditionsModal';
 
 chai.use(chaiEnzyme());
 
@@ -16,6 +17,7 @@ describe('FormDetails', () => {
   let getDesignerComponentStub;
   let getAllDesignerComponentsStub;
   let scriptEditorModalStub;
+  let formConditionsModalStub;
 
   const formData = {
     id: 1,
@@ -37,13 +39,17 @@ describe('FormDetails', () => {
     });
     getAllDesignerComponentsStub = sinon.stub(ComponentStore, 'getAllDesignerComponents');
     getAllDesignerComponentsStub.returns({});
-    scriptEditorModalStub = sinon.stub(ScriptEditorModal, 'default').returns(<div>A stub</div>);
+    scriptEditorModalStub = sinon.stub(ScriptEditorModal, 'default')
+      .returns(<div>A stub</div>);
+    formConditionsModalStub = sinon.stub(FormConditionsModal, 'default')
+      .returns(<div>formConditions stub</div>);
   });
 
   after(() => {
     getDesignerComponentStub.restore();
     getAllDesignerComponentsStub.restore();
     scriptEditorModalStub.restore();
+    formConditionsModalStub.restore();
   });
 
   it('should render form details when form data is present', () => {
@@ -64,6 +70,41 @@ describe('FormDetails', () => {
     expect(wrapper.find('Canvas').props().formUuid).to.eql('someUuid');
   });
 
+  it('should render form title when form data is present without version', () => {
+    const formDataWithoutVersion = {
+      id: 1,
+      name: 'someFormName',
+      uuid: 'someUuid',
+      resources: [],
+      published: false,
+    };
+    wrapper = mount(
+      <Provider store={getStore()}>
+        <FormDetail
+          formData={formDataWithoutVersion}
+          publishForm={() => {}}
+          saveFormResource={() => {}}
+          setError={() => {}}
+        />
+      </Provider>
+    );
+    expect(wrapper.find('.header-title').at(0).text()).to.eql('someFormName  - Draft');
+  });
+  it('should render null when form data is not present', () => {
+    wrapper = mount(
+      <Provider store={getStore()}>
+        <FormDetail
+          publishForm={() => {}}
+          saveFormResource={() => {}}
+          setError={() => {}}
+        />
+      </Provider>
+    );
+    expect(wrapper).to.have.exactly(0).descendants('ControlPool');
+    expect(wrapper).to.have.exactly(0).descendants('ControlPropertiesContainer');
+    expect(wrapper).to.have.exactly(0).descendants('Canvas');
+  });
+
   it('should pass the given defaultLocale to Canvas', () => {
     wrapper = mount(
       <Provider store={getStore()}>
@@ -113,7 +154,12 @@ describe('FormDetails', () => {
     expect(saveEventProps).to.have.property('label');
     expect(saveEventProps.label).to.be.equal('Save Event');
     expect(saveEventProps.eventProperty).to.be.equal('formSaveEvent');
-    expect(formEvents.length).to.be.equal(2);
+
+    const formConditionsEventProps = formEvents.at(2).props();
+    expect(formConditionsEventProps).to.have.property('label');
+    expect(formConditionsEventProps.label).to.be.equal('Form Conditions');
+    expect(formConditionsEventProps.eventProperty).to.be.equal('formConditionsEvent');
+    expect(formEvents.length).to.be.equal(3);
   });
 
   it('should create the idGenerator and pass it as props to required children', () => {
@@ -169,8 +215,8 @@ describe('FormDetails', () => {
     expect(wrapper.find('FormEventEditor').find('Popup').length).to.eq(1);
   });
 
-  it('should not render popup when formInitEvent and formSaveEvent are false', () => {
-    const property = { formInitEvent: false, formSaveEvent: false };
+  it('should render popup when formConditionsEvent is true', () => {
+    const property = { formConditionsEvent: true };
     const state = { controlProperty: { property }, formDetails: {}, controlDetails: {} };
     const store = getStore(state);
     wrapper = mount(
@@ -182,9 +228,27 @@ describe('FormDetails', () => {
           setError={() => {}}
         />
       </Provider>);
-    expect(wrapper.find('FormEventEditor').find('Popup').length).to.eq(0);
+
+    expect(wrapper.find('FormEventEditor').find('Popup').length).to.eq(1);
   });
 
+  it('should not render popup when formInitEvent,formSaveEvent,formConditionsEvent are false',
+    () => {
+      const property = { formInitEvent: false, formSaveEvent: false, formConditionsEvent: false };
+      const state = { controlProperty: { property }, formDetails: {}, controlDetails: {} };
+      const store = getStore(state);
+      wrapper = mount(
+      <Provider store={store}>
+        <FormDetail
+          formData={formData}
+          publishForm={() => {}}
+          saveFormResource={() => {}}
+          setError={() => {}}
+        />
+      </Provider>);
+      expect(wrapper.find('FormEventEditor').find('Popup').length).to.eq(0);
+    });
+
   it('should render script of onFormSave when formSaveEvent is true', () => {
     const dummyScript = 'function abcd(){ var a=1;}';
     const property = { formSaveEvent: true };
@@ -222,4 +286,29 @@ describe('FormDetails', () => {
     expect(wrapper.find('FormEventEditor').find('Popup').find('default')
       .prop('script')).to.eq(dummyScript);
   });
+
+  it('should render controlEvents and formDetails when formConditionsEvent is true', () => {
+    const dummyScript = '';
+    const property = { formConditionsEvent: true };
+    const formDetails = { events: { onFormInit: dummyScript } };
+    const allObsControlEvents = [{ id: '1', name: 'name', events: { onValueChange: '' } }];
+    const state = { controlProperty: { property },
+      formDetails, controlDetails: { allObsControlEvents } };
+    const store = getStore(state);
+    wrapper = mount(
+      <Provider store={store}>
+        <FormDetail
+          formData={formData}
+          publishForm={() => {}}
+          saveFormResource={() => {}}
+          setError={() => {}}
+        />
+      </Provider>);
+    expect(wrapper.find('FormEventEditor').find('Popup').find('default')
+      .prop('formDetails')).to.eq(formDetails);
+    expect(wrapper.find('FormEventEditor').find('Popup').find('default')
+      .prop('controlEvents')).to.eq(allObsControlEvents);
+    expect(wrapper.find('FormEventEditor').find('Popup').find('default')
+      .prop('script')).to.eq(undefined);
+  });
 });
diff --git a/test/form-builder/components/FormDetailContainer.spec.js b/test/form-builder/components/FormDetailContainer.spec.js
index b5bec314..ffa0bbf4 100644
--- a/test/form-builder/components/FormDetailContainer.spec.js
+++ b/test/form-builder/components/FormDetailContainer.spec.js
@@ -165,6 +165,7 @@ describe('FormDetailContainer', () => {
       'resources:(value,dataType,uuid))';
     const formResourceURL = `${formBuilderConstants.formUrl}/${'FID'}?${params}`;
     sinon.stub(httpInterceptor, 'get').callsFake(() => Promise.resolve(formData));
+
     const wrapper = mount(
       <Provider store={getStore()}>
       <FormDetailContainer
@@ -182,6 +183,7 @@ describe('FormDetailContainer', () => {
     sinon.assert.calledWith(httpInterceptor.get, formResourceURL);
   });
 
+
   it('should not show publish button & save button before get formData', () => {
     const wrapper = mount(
       <Provider store={getStore()}>
@@ -614,8 +616,10 @@ describe('FormDetailContainer', () => {
       }];
       const updatedForm = Object.assign({}, formData, { resources });
       const postStub = sinon.stub(httpInterceptor, 'post');
-      postStub.onFirstCall().returns(Promise.resolve({}))
-        .onSecondCall(1).returns(Promise.resolve(updatedForm));
+      postStub.onFirstCall().returns(Promise
+        .resolve('[{"display" :"some name to display", "locale": "en"}]'))
+        .onSecondCall().returns(Promise.resolve({}))
+        .onThirdCall(1).returns(Promise.resolve(updatedForm));
       const wrapper = shallow(
         <FormDetailContainer
           {...defaultProps}
@@ -624,18 +628,26 @@ describe('FormDetailContainer', () => {
       wrapper.setState({ httpReceived: true });
       sinon.stub(wrapper.instance(), 'getFormJson').callsFake(() => formJson);
       let publishButton = undefined;
+      updatedForm.version = '2';
       wrapper.setState({ formData: updatedForm },
         () => {
           publishButton = wrapper.find('.publish-button');
         });
-      wrapper.setState({ referenceVersion: '1' });
+      wrapper.setState({ referenceVersion: '1', referenceFormUuid: 'ref-uuid' });
       publishButton.simulate('click');
       setTimeout(() => {
-        sinon.assert.calledTwice(httpInterceptor.post);
+        sinon.assert.calledThrice(httpInterceptor.post);
+        const formNameTranslations = {
+          form: { name: wrapper.state().originalFormName, uuid: 'FID' },
+          value: '',
+        };
+        const formNameTranslateSaveUrl = new UrlHelper()
+          .bahmniSaveFormNameTranslateUrl('ref-uuid');
+        sinon.assert.calledOnce(postStub.withArgs(formNameTranslateSaveUrl, formNameTranslations));
         sinon.assert.callOrder(
           postStub.withArgs(formBuilderConstants.saveTranslationsUrl,
-            [{ formName: 'someFormName', locale: 'en', version: '1', referenceVersion: '1',
-              formUuid: 'someUuid' }]),
+            [{ formName: 'someFormName', locale: 'en', version: '2', referenceVersion: '1',
+              referenceFormUuid: 'ref-uuid', formUuid: 'someUuid' }]),
           postStub.withArgs(new UrlHelper().bahmniFormPublishUrl(formData.uuid))
         );
         postStub.restore();
@@ -643,6 +655,46 @@ describe('FormDetailContainer', () => {
       }, 500);
     });
 
+    it('should not call save form name translation endpoint if the form is of 1st version' +
+      ' and publish form when the publish button is clicked', (done) => {
+      const resources = [{
+        dataType: formBuilderConstants.formResourceDataType,
+        value: '{"controls": [{}]}',
+      }];
+      const updatedForm = Object.assign({}, formData, { resources });
+      const postStub = sinon.stub(httpInterceptor, 'post');
+      postStub.onFirstCall().returns(Promise
+        .resolve('[{"display" :"some name to display", "locale": "en"}]'))
+        .onSecondCall().returns(Promise.resolve({}))
+        .onThirdCall(1).returns(Promise.resolve(updatedForm));
+      const wrapper = shallow(
+        <FormDetailContainer
+          {...defaultProps}
+        />, { context }
+      );
+      wrapper.setState({ httpReceived: true });
+      sinon.stub(wrapper.instance(), 'getFormJson').callsFake(() => formJson);
+      let publishButton = undefined;
+      wrapper.setState({ formData: updatedForm },
+        () => {
+          publishButton = wrapper.find('.publish-button');
+        });
+      wrapper.setState({ referenceVersion: '1', referenceFormUuid: 'ref-uuid' });
+      publishButton.simulate('click');
+      setTimeout(() => {
+        sinon.assert.calledTwice(httpInterceptor.post);
+        const formNameTranslations = {
+          form: { name: wrapper.state().originalFormName, uuid: 'FID' },
+          value: '',
+        };
+        const formNameTranslateSaveUrl = new UrlHelper()
+          .bahmniSaveFormNameTranslateUrl('ref-uuid');
+        sinon.assert.notCalled(postStub.withArgs(formNameTranslateSaveUrl, formNameTranslations));
+        postStub.restore();
+        done();
+      }, 500);
+    });
+
     it('should pick defaultLocale from local storage when its not present in' +
         ' props during form publish', (done) => {
       window.localStorage = {
@@ -671,14 +723,14 @@ describe('FormDetailContainer', () => {
         () => {
           publishButton = wrapper.find('.publish-button');
         });
-      wrapper.setState({ referenceVersion: '1' });
+      wrapper.setState({ referenceVersion: '1', referenceFormUuid: 'ref-uuid' });
       publishButton.simulate('click');
       setTimeout(() => {
         sinon.assert.calledTwice(httpInterceptor.post);
         sinon.assert.callOrder(
           postStub.withArgs(formBuilderConstants.saveTranslationsUrl,
             [{ formName: 'someFormName', locale: 'fr', version: '1', referenceVersion: '1',
-              formUuid: 'someUuid' }]),
+              referenceFormUuid: 'ref-uuid', formUuid: 'someUuid' }]),
           postStub.withArgs(new UrlHelper().bahmniFormPublishUrl(formData.uuid))
         );
         postStub.restore();
@@ -912,5 +964,126 @@ describe('FormDetailContainer', () => {
       const notificationContainer = wrapper.find('NotificationContainer');
       expect(notificationContainer.prop('notification').message).to.equal('Section/Table is empty');
     });
+
+    it('should copy the translation to new version after editing', (done) => {
+      const wrapper = mount(
+        <Provider store={getStore()}>
+          <FormDetailContainer
+            {...defaultProps}
+          /></Provider>, { context }
+      );
+      wrapper.find('FormDetailContainer').setState({ formData: publishedFormData,
+        httpReceived: true, originalFormName: publishedFormData.name });
+      wrapper.update();
+      const editButton = wrapper.find('.edit-button');
+      editButton.simulate('click');
+      wrapper.find('EditModal').find('.btn--highlight').simulate('click');
+      expect(wrapper.find('FormDetailContainer').state().referenceVersion)
+        .to.eq(publishedFormData.version);
+      expect(wrapper.find('FormDetailContainer').state().referenceFormUuid)
+        .to.eq(publishedFormData.uuid);
+      sinon.stub(wrapper.find('FormDetailContainer').instance(), 'getFormJson').returns({});
+      sinon.stub(wrapper.find('FormDetailContainer').instance(), 'hasEmptyBlocks').returns(false);
+      const postStub = sinon.stub(httpInterceptor, 'post');
+      postStub.callsFake(() => Promise.resolve(Object.assign({},
+        formData, { version: '2', uuid: 'next-uuid' })));
+      const saveButton = wrapper.find('.save-button');
+      saveButton.simulate('click');
+      setTimeout(() => {
+        expect(postStub.getCall(0).args[0]).to.eq(formBuilderConstants.bahmniFormResourceUrl);
+        expect(JSON.parse(postStub.getCall(0).args[1].value).referenceVersion)
+          .to.eq(publishedFormData.version);
+        expect(JSON.parse(postStub.getCall(0).args[1].value).referenceFormUuid)
+          .to.eq(publishedFormData.uuid);
+        done();
+      }, 500);
+      httpInterceptor.post.restore();
+    });
+
+    it('should return Obs Control Events when formJsonData is passed', () => {
+      const wrapper = shallow(
+        <FormDetailContainer
+          {...defaultProps}
+        />, {
+          context: {
+            router: {
+              push() {
+              },
+            },
+          },
+        }
+      );
+      wrapper.setState({ formData, httpReceived: true });
+      const formJsonData = {
+        name: 'SectionForm',
+        id: 1,
+        type: 'section',
+        controls: [
+          {
+            type: 'section',
+            controls: [
+              {
+                type: 'obsControl',
+                id: 2,
+                concept: {
+                  name: 'obs1',
+                },
+              },
+            ],
+          },
+          {
+            type: 'obsControl',
+            id: 3,
+            concept: {
+              name: 'obs2',
+            },
+            events: { onValueChange: 'func(){}' },
+          },
+        ],
+      };
+      const estimatedObsControlEvents = [
+        { id: 2,
+          name: 'obs1',
+          events: undefined,
+        },
+        { id: 3,
+          name: 'obs2',
+          events: { onValueChange: 'func(){}' },
+        },
+      ];
+      sinon.stub(wrapper.instance(), 'getFormJson').callsFake(() => formJsonData);
+
+      const obsControlEvents = wrapper.instance().getObsControlEvents(formJsonData);
+
+      expect(JSON.stringify(estimatedObsControlEvents)).to.equal(JSON.stringify(obsControlEvents));
+    });
+
+    it('should return empty Obs Control Events when formJsonData without ' +
+      'obsControl  is passed', () => {
+      const wrapper = shallow(
+        <FormDetailContainer
+          {...defaultProps}
+        />, {
+          context: {
+            router: {
+              push() {
+              },
+            },
+          },
+        }
+      );
+      wrapper.setState({ formData, httpReceived: true });
+      const formJsonData = {
+        name: 'SectionForm',
+        id: 1,
+        type: 'section',
+      };
+      const estimatedObsControlEvents = [];
+      sinon.stub(wrapper.instance(), 'getFormJson').callsFake(() => formJsonData);
+
+      const obsControlEvents = wrapper.instance().getObsControlEvents(formJsonData);
+
+      expect(JSON.stringify(estimatedObsControlEvents)).to.equal(JSON.stringify(obsControlEvents));
+    });
   });
 });
diff --git a/test/form-builder/components/FormEventEditor.spec.js b/test/form-builder/components/FormEventEditor.spec.js
index 8d32cfda..619ac9d2 100644
--- a/test/form-builder/components/FormEventEditor.spec.js
+++ b/test/form-builder/components/FormEventEditor.spec.js
@@ -7,8 +7,8 @@ import sinon from 'sinon';
 import { shallow } from 'enzyme';
 import { getStore } from 'test/utils/storeHelper';
 
-import { formEventUpdate, saveEventUpdate, setChangedProperty } from 'form-builder/actions/control';
-
+import { saveEventUpdate, formConditionsEventUpdate } from 'form-builder/actions/control';
+import { setChangedProperty } from 'form-builder/actions/control';
 chai.use(chaiEnzyme());
 
 describe('FormEventEditor', () => {
@@ -18,6 +18,7 @@ describe('FormEventEditor', () => {
   let updateScriptSpy;
   const formDetails = {};
   const property = {};
+  const formControlEvents = {};
 
   beforeEach(() => {
     closeEventEditorSpy = sinon.spy();
@@ -26,6 +27,7 @@ describe('FormEventEditor', () => {
       <FormEventEditor
         children={<DummyComponent />}
         closeEventEditor={closeEventEditorSpy}
+        formControlEvents={formControlEvents}
         formDetails={formDetails}
         property={property}
         updateScript={updateScriptSpy}
@@ -33,6 +35,7 @@ describe('FormEventEditor', () => {
   });
 
   it('should render with passed child and properties', () => {
+    expect(wrapper.find(DummyComponent).prop('formControlEvents')).to.eq(formControlEvents);
     expect(wrapper.find(DummyComponent).prop('formDetails')).to.eq(formDetails);
     expect(wrapper.find(DummyComponent).prop('property')).to.eq(property);
     expect(wrapper.find(DummyComponent).prop('closeEventEditor')).to.eq(closeEventEditorSpy);
@@ -58,7 +61,7 @@ describe('FormEventEditorWithRedux_where_formSaveEvent_is_true', () => {
 
   beforeEach(() => {
     property = { formSaveEvent: true };
-    state = { controlProperty: { property }, formDetails };
+    state = { controlProperty: { property }, formDetails, controlDetails: {} };
     store = getStore(state);
     wrapper = shallow(
         <FormEventEditorWithRedux
@@ -67,13 +70,16 @@ describe('FormEventEditorWithRedux_where_formSaveEvent_is_true', () => {
         />);
   });
 
-  it('should update formInitEvent, formSaveEvent property when closeEventEditor is called', () => {
+  it('should update formInitEvent, formSaveEvent, formConditionsEvent property ' +
+    'when closeEventEditor is called', () => {
     wrapper.find('FormEventEditor').prop('closeEventEditor')();
-    sinon.assert.calledTwice(store.dispatch);
+    sinon.assert.calledThrice(store.dispatch);
     sinon.assert.calledOnce(store.dispatch
       .withArgs(setChangedProperty({ formInitEvent: false })));
     sinon.assert.calledOnce(store.dispatch
       .withArgs(setChangedProperty({ formSaveEvent: false })));
+    sinon.assert.calledOnce(store.dispatch
+      .withArgs(setChangedProperty({ formConditionsEvent: false })));
   });
 
   it('should update saveEventUpdate property when updateScript is called ' +
@@ -92,7 +98,7 @@ describe('FormEventEditorWithRedux_where_formSaveEvent_is_false', () => {
   const DummyComponent = () => <div></div>;
   const formDetails = {};
   const property = { formSaveEvent: false };
-  const state = { controlProperty: { property }, formDetails };
+  const state = { controlProperty: { property }, formDetails, controlDetails: {} };
   const store = getStore(state);
 
   beforeEach(() => {
@@ -107,9 +113,60 @@ describe('FormEventEditorWithRedux_where_formSaveEvent_is_false', () => {
     'is called and formSaveEvent is false', () => {
     const script = 'abcd';
     wrapper.find('FormEventEditor').prop('updateScript')(script, property);
+    sinon.assert.callCount(store.dispatch, 0);
+  });
+});
+
+describe('FormEventEditorWithRedux_where_formConditionsEvent_is_true', () => {
+  let wrapper;
+  const DummyComponent = () => <div></div>;
+  const formDetails = {};
+  let property;
+  let state;
+  let store;
+
+  beforeEach(() => {
+    property = { formConditionsEvent: true };
+    state = { controlProperty: { property }, formDetails, controlDetails: {} };
+    store = getStore(state);
+    wrapper = shallow(
+      <FormEventEditorWithRedux
+        children={<DummyComponent />}
+        store = {store}
+      />);
+  });
+  it('should update formConditionsEvent property when updateScript is called ' +
+    'and formConditionsEvent is true', () => {
+    const script = 'abcd';
+    wrapper.find('FormEventEditor').prop('updateScript')(script, property);
     sinon.assert.calledOnce(store.dispatch);
     sinon.assert.calledOnce(store.dispatch
-      .withArgs(formEventUpdate(script)));
+      .withArgs(formConditionsEventUpdate(script)));
+  });
+});
+
+
+describe('FormEventEditorWithRedux_where_formConditionsEvent_is_false', () => {
+  let wrapper;
+  const DummyComponent = () => <div></div>;
+  const formDetails = {};
+  const property = { formConditionsEvent: false };
+  const state = { controlProperty: { property }, formDetails, controlDetails: {} };
+  const store = getStore(state);
+
+  beforeEach(() => {
+    wrapper = shallow(
+      <FormEventEditorWithRedux
+        children={<DummyComponent />}
+        store = {store}
+      />);
+  });
+
+  it('should update formConditionsEvent property when updateScript ' +
+    'is called and formConditionsEvent is false', () => {
+    const script = 'abcd';
+    wrapper.find('FormEventEditor').prop('updateScript')(script, property);
+    sinon.assert.callCount(store.dispatch, 0);
   });
 });
 
diff --git a/test/form-builder/components/FormPreviewModal.spec.js b/test/form-builder/components/FormPreviewModal.spec.js
index 01ee7663..41e65e34 100644
--- a/test/form-builder/components/FormPreviewModal.spec.js
+++ b/test/form-builder/components/FormPreviewModal.spec.js
@@ -11,6 +11,8 @@ chai.use(chaiEnzyme());
 describe('FormPreviewModal', () => {
   let wrapper;
   let closeSpy;
+  let setErrorMessageSpy;
+  let renderWithControlsCounter = 0;
 
   const formJson = {
     name: 'Groovy',
@@ -43,50 +45,135 @@ describe('FormPreviewModal', () => {
       },
     ],
     version: '43',
+    events: {
+      onFormSave: 'function(form){}',
+    },
   };
   beforeEach(() => {
     closeSpy = sinon.spy();
+    setErrorMessageSpy = sinon.spy();
+    renderWithControlsCounter = 0;
+    window.renderWithControls = function renderWithControls() {
+      renderWithControlsCounter++;
+      return 'container';
+    };
+  });
+
+  function mountComponent(formJsonMetadata) {
     wrapper = mount(
       <FormPreviewModal
         close={closeSpy}
-        formJson={formJson}
+        formJson={formJsonMetadata}
+        setErrorMessage={setErrorMessageSpy}
       />
     );
-  });
+  }
 
   it('should render create form preview modal when form data exists', () => {
+    mountComponent(formJson);
     const container = wrapper.find('.preview-container');
     expect(container).to.have.length(1);
     expect(container.children().length).to.be.equal(3);
+    expect(renderWithControlsCounter).to.be.equal(1);
   });
 
   it('should not render create form modal when form data doesnot exist', () => {
-    wrapper = mount(
-        <FormPreviewModal
-          close={closeSpy}
-          formJson={undefined}
-        />
-    );
+    mountComponent(undefined);
     const modal = wrapper.find('.preview-container');
     const container = wrapper.find('Container');
     expect(container).to.be.length(0);
     expect(modal).to.be.length(0);
+    expect(renderWithControlsCounter).to.be.equal(0);
   });
 
   it('should call close modal function when close button is clicked', () => {
+    mountComponent(formJson);
     const button = wrapper.find('.preview-close-btn');
     button.simulate('click');
     sinon.assert.calledOnce(closeSpy);
   });
 
   it('should call close modal function when close icon is clicked', () => {
+    mountComponent(formJson);
     const button = wrapper.find('.fa-times');
     button.simulate('click');
     sinon.assert.calledOnce(closeSpy);
   });
 
-  it('should render container if metadata is present', () => {
-    const container = wrapper.find('Container');
-    expect(container).to.have.length(1);
+  it('should render save button in footer', () => {
+    mountComponent(formJson);
+    const saveButton = wrapper.find('.btn--highlight');
+    expect(saveButton).to.have.length(1);
+  });
+
+  it('should call 3 window methods and set container to state on click of save button', () => {
+    mountComponent(formJson);
+    const button = wrapper.find('.btn--highlight');
+    wrapper.setState({ container: { state: { data: {} } } });
+    let runEventScriptCounter = 0;
+    let unMountFormCounter = 0;
+    let getObservationsCounter = 0;
+    window.runEventScript = function runEventScript() {
+      runEventScriptCounter++;
+    };
+    window.unMountForm = function unMountForm() {
+      unMountFormCounter++;
+    };
+    window.getObservations = function getObservations() {
+      getObservationsCounter++;
+    };
+
+    button.simulate('click');
+
+    expect(runEventScriptCounter).to.equal(1);
+    expect(unMountFormCounter).to.equal(1);
+    expect(getObservationsCounter).to.equal(1);
+  });
+
+  it('should set renderWithControls return value to state variable container on componentDidMount',
+    () => {
+      mountComponent(formJson);
+      expect(renderWithControlsCounter).to.be.equal(1);
+      expect(wrapper.state().container).to.equal('container');
+    });
+
+  it('should return error message for single error object', () => {
+    const errorMessage = FormPreviewModal.formatErrors({ message: 'It is an error' });
+
+    expect(errorMessage).to.equal('It is an error');
+  });
+
+  it('should return pipe separated error messages for array of errors', () => {
+    const errorMessage = FormPreviewModal.formatErrors([{ message: 'It is an error1' },
+      { message: 'It is an error2' }]);
+
+    expect(errorMessage).to.equal('It is an error1 | It is an error2');
+  });
+
+  it('should return [ERROR] when message key is not present in error object(s)', () => {
+    const errorMessageObject = FormPreviewModal.formatErrors({ mesage: 'It is an error' });
+    const errorMessagesArray = FormPreviewModal.formatErrors([{ message: 'It is an error1' },
+      { mesage: 'It is an error2' }]);
+
+    expect(errorMessageObject).to.equal('[ERROR]');
+    expect(errorMessagesArray).to.equal('It is an error1 | [ERROR]');
+  });
+
+  it('should call setErrorMessage when runEventScript throws exception', () => {
+    mountComponent(formJson);
+    const button = wrapper.find('.btn--highlight');
+    wrapper.setState({ container: { state: { data: {} } } });
+    window.runEventScript = function runEventScript() {
+      throw Object.assign(new Error('Error'));
+    };
+    window.unMountForm = function unMountForm() {
+    };
+    window.getObservations = function getObservations() {
+    };
+
+    button.simulate('click');
+
+    sinon.assert.calledOnce(setErrorMessageSpy);
+    sinon.assert.calledWith(setErrorMessageSpy, { type: 'Exception', message: 'Error' });
   });
 });
diff --git a/test/form-builder/components/FormTranslationsContainer.spec.js b/test/form-builder/components/FormTranslationsContainer.spec.js
index fdd9da5f..4818b80c 100644
--- a/test/form-builder/components/FormTranslationsContainer.spec.js
+++ b/test/form-builder/components/FormTranslationsContainer.spec.js
@@ -41,11 +41,14 @@ describe('FormTranslationContainer', () => {
       ],
     },
     locale: 'en',
+    formNames: { form_name: ['default_form_name_display_en'] },
   };
 
+  const nameTranslations = '[{"display": "form_name_display_es", "locale": "es"},' +
+    ' {"display": "default_form_name_display_en", "locale": "en"}]';
 
   const defaultProps = {
-    match: { params: { formUuid: 'form_uuid' } },
+    match: { params: { formUuid: 'form_uuid' }, path: '' },
     routes: [],
     defaultLocale: 'en',
   };
@@ -66,6 +69,8 @@ describe('FormTranslationContainer', () => {
     mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/translate?formName=' +
       'form_name&formVersion=2&locale=en&formUuid=form_uuid')
       .returns(Promise.resolve(translationData));
+    mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/name/translate?formName=' +
+      'form_name&formUuid=form_uuid').returns(Promise.resolve(nameTranslations));
 
     breadcrumbsStub = sinon.stub(FormBuilderBreadcrumbs, 'default').returns(<div>A stub</div>);
   });
@@ -105,8 +110,8 @@ describe('FormTranslationContainer', () => {
       expect(expectedLocaleOptions, localeOptions.find('select').html());
 
       const formTranslationContainer = wrapper.find('FormTranslationsContainer');
-
-      sinon.assert.callOrder(store.dispatch.withArgs(
+      sinon.assert.callOrder(
+        store.dispatch.withArgs(
         updateTranslations({
           value: 'desc Examination Notes',
           type: 'concepts',
@@ -119,7 +124,6 @@ describe('FormTranslationContainer', () => {
           translationKey: 'SEVERE_UNDERNUTRITION_13',
           locale: 'en',
         })));
-
       expect(formTranslationContainer.find('.info-message').text()).to
         .have.string('Please save the changes before selecting a locale.');
       formTranslationContainer.update();
@@ -129,6 +133,8 @@ describe('FormTranslationContainer', () => {
       sinon.assert.callOrder(
         mockHttp.get.withArgs('/bahmni_config/openmrs/apps/home/locale_languages.json'),
         mockHttp.get.withArgs('/openmrs/ws/rest/v1/form/form_uuid?v=custom:(id,uuid,name,version)'),
+        mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/name/translate?formName=' +
+          'form_name&formUuid=form_uuid'),
         mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/translate?formName=' +
           'form_name&formVersion=2&locale=en&formUuid=form_uuid')
       );
@@ -145,7 +151,6 @@ describe('FormTranslationContainer', () => {
       'form_name&formVersion=2&locale=es&formUuid=form_uuid')
       .returns(Promise.resolve(localeTranslations));
 
-
     const expectedTranslationData = {
       headers: [
         'Translation Key',
@@ -179,6 +184,8 @@ describe('FormTranslationContainer', () => {
           mockHttp.get.withArgs('/bahmni_config/openmrs/apps/home/locale_languages.json'),
           mockHttp.get.withArgs('/openmrs/ws/rest/v1/form/form_uuid?v=custom:' +
             '(id,uuid,name,version)'),
+          mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/name/translate?formName=' +
+            'form_name&formUuid=form_uuid'),
           mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/translate?formName=' +
             'form_name&formVersion=2&locale=en&formUuid=form_uuid'),
           mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/translate?formName=' +
@@ -264,18 +271,25 @@ describe('FormTranslationContainer', () => {
 
   it('should save generated translations', (done) => {
     const localeTranslations = Object.assign({}, translationData);
-
     mockHttp.post.withArgs('/openmrs/ws/rest/v1/bahmniie/form/saveTranslation')
       .returns(Promise.resolve({}));
+    mockHttp.post.withArgs('/openmrs/ws/rest/v1/bahmniie/form/name/saveTranslation')
+      .returns(Promise.resolve({}));
     localeTranslations.locale = 'es';
     localeTranslations.concepts.SEVERE_UNDERNUTRITION_13 = ['Severe Undernutrition es'];
+    localeTranslations.formNames.form_name = ['default_form_name_display_es'];
     mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/translate?formName=' +
       'form_name&formVersion=2&locale=es&formUuid=form_uuid')
       .returns(Promise.resolve(localeTranslations));
+    mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/name/translate?formName=' +
+      'form_name&formUuid=form_uuid')
+      .returns(Promise.resolve(nameTranslations));
 
     localeTranslations.formName = 'form_name';
     localeTranslations.formUuid = 'form_uuid';
     localeTranslations.version = '2';
+
+    delete localeTranslations.formNames;
     const wrapper = mount(
       <Provider store={getStore({ translations: { es: localeTranslations } })}>
 
@@ -288,10 +302,24 @@ describe('FormTranslationContainer', () => {
     setTimeout(() => {
       setTimeout(() => {
         wrapper.find('#save-translations-button').simulate('click');
+        const nameTranslation = {
+          form: { name: 'form_name', uuid: 'form_uuid' },
+          value: '[{"display":["form_name_display_es"],"locale":"es"},' +
+            '{"display":"default_form_name_display_en","locale":"en"}]',
+        };
+        sinon.assert.calledOnce(
+          mockHttp.post.withArgs('/openmrs/ws/rest/v1/bahmniie/form/name/saveTranslation',
+            nameTranslation)
+        );
+        delete localeTranslations.formNames;
         sinon.assert.calledOnce(mockHttp.post.withArgs(
           '/openmrs/ws/rest/v1/bahmniie/form/saveTranslation', [localeTranslations]));
 
         setTimeout(() => {
+          sinon.assert.called(
+            mockHttp.get.withArgs('/openmrs/ws/rest/v1/bahmniie/form/name/translate?formName=' +
+              'form_name&formUuid=form_uuid')
+          );
           const formTranslationContainer = wrapper.find('FormTranslationsContainer');
           formTranslationContainer.update();
           expect(wrapper.find('NotificationContainer').props().notification)
diff --git a/test/form-builder/components/FormTranslationsGrid.spec.js b/test/form-builder/components/FormTranslationsGrid.spec.js
index 344abd94..38e33191 100644
--- a/test/form-builder/components/FormTranslationsGrid.spec.js
+++ b/test/form-builder/components/FormTranslationsGrid.spec.js
@@ -35,7 +35,9 @@ describe('FormTranslationsGrid', () => {
           SECTION_12: [
             'SECTION es',
           ],
-
+        },
+        formNames: {
+          FORM_NAME: ['Sample Name ESPANOL'],
         },
         locale: 'es',
       },
@@ -53,6 +55,9 @@ describe('FormTranslationsGrid', () => {
             'SECTION_12',
           ],
         },
+        formNames: {
+          FORM_NAME: ['Sample Name FRENCH'],
+        },
         locale: 'fr',
       },
     ],
@@ -76,7 +81,7 @@ describe('FormTranslationsGrid', () => {
         <FormTranslationsGrid translationData={data} />
       </Provider>);
 
-    expect(getTableBody()).to.have.exactly(3).descendants('tr');
+    expect(getTableBody()).to.have.exactly(4).descendants('tr');
     expect(wrapper.find('table').find('thead')).to.have.exactly(1).descendants('tr');
     expect(wrapper.find('table').find('thead')).to.have.exactly(3).descendants('th');
 
@@ -86,12 +91,15 @@ describe('FormTranslationsGrid', () => {
       expect(getItem(rowIndex, 1)).to.have.exactly(1).descendants('FreeTextAutoComplete');
     }
 
-    expect(getData(0, 0)).to.have.string('SEVERE_UNDERNUTRITION_13');
-    expect(getData(0, 1)).to.have.string('Undernutrition es');
-    expect(getData(0, 2)).to.have.string('Undernutrition');
-    expect(getData(2, 0)).to.have.string('SECTION_12');
-    expect(getData(2, 1)).to.have.string('SECTION es');
-    expect(getData(2, 2)).to.have.string('SECTION_12');
+    expect(getData(0, 0)).to.have.string('FORM_NAME');
+    expect(getData(0, 1)).to.have.string('Sample Name ESPANOL');
+    expect(getData(0, 2)).to.have.string('Sample Name FRENCH');
+    expect(getData(1, 0)).to.have.string('SEVERE_UNDERNUTRITION_13');
+    expect(getData(1, 1)).to.have.string('Undernutrition es');
+    expect(getData(1, 2)).to.have.string('Undernutrition');
+    expect(getData(3, 0)).to.have.string('SECTION_12');
+    expect(getData(3, 1)).to.have.string('SECTION es');
+    expect(getData(3, 2)).to.have.string('SECTION_12');
   });
 
   it('should update store on value change', () => {
@@ -106,12 +114,19 @@ describe('FormTranslationsGrid', () => {
     const onChange = freeTextAutocomplete.props().onChange;
     expect(onChange).to.be.instanceOf(Function);
     onChange({ value: 'something' }, 'concepts', 'SEVERE_UNDERNUTRITION_13', 'en');
+    onChange({ value: 'NEW NAME TRANSLATION' }, 'formNames', 'FORM_NAME', 'en');
     sinon.assert.calledOnce(store.dispatch.withArgs(updateTranslations(
       {
         value: 'something', type: 'concepts',
         translationKey: 'SEVERE_UNDERNUTRITION_13', locale: 'en',
       }
     )));
+    sinon.assert.calledOnce(store.dispatch.withArgs(updateTranslations(
+      {
+        value: 'NEW NAME TRANSLATION', type: 'formNames',
+        translationKey: 'FORM_NAME', locale: 'en',
+      }
+    )));
   });
 });
 
diff --git a/test/form-builder/components/ObsControlScriptEditorModal.spec.js b/test/form-builder/components/ObsControlScriptEditorModal.spec.js
new file mode 100644
index 00000000..8becd468
--- /dev/null
+++ b/test/form-builder/components/ObsControlScriptEditorModal.spec.js
@@ -0,0 +1,111 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import chaiEnzyme from 'chai-enzyme';
+import chai, { expect } from 'chai';
+import ObsControlScriptEditorModal from
+    '../../../src/form-builder/components/ObsControlScriptEditorModal';
+import sinon from 'sinon';
+import CodeMirror from 'codemirror';
+
+chai.use(chaiEnzyme());
+
+describe('ObsControlScriptEditorModal', () => {
+  let wrapper;
+  let updateScriptSpy;
+  let closeSpy;
+  let codeMirrorStub;
+
+  beforeEach(() => {
+    updateScriptSpy = sinon.spy();
+    closeSpy = sinon.spy();
+  });
+
+  afterEach(() => {
+    if (codeMirrorStub) {
+      codeMirrorStub.restore();
+    }
+  });
+
+  it('should render obs control script editor modal', () => {
+    const controlScript = '';
+    const controlEventTitleId = '1';
+    const controlEventTitleName = 'title';
+    wrapper = mount(
+      <ObsControlScriptEditorModal
+        close={closeSpy}
+        script={controlScript}
+        titleId={controlEventTitleId}
+        titleName={controlEventTitleName}
+        updateScript={updateScriptSpy}
+      />);
+    expect(wrapper.find('.control-modal')).to.have.length(1);
+    expect(wrapper.find('.control-modal .label-value').at(0).text()).to.eq(controlEventTitleId);
+    expect(wrapper.find('.control-modal .label-value').at(1).text()).to.eq(controlEventTitleName);
+    expect(wrapper.find('.control-modal .editor-wrapper').text()).to.eq('');
+  });
+
+  it('should not render any obs control script editor modal when title id is null', () => {
+    const controlScript = '';
+    wrapper = mount(
+      <ObsControlScriptEditorModal
+        close={closeSpy}
+        script={controlScript}
+        updateScript={updateScriptSpy}
+      />);
+    expect(wrapper.find('.control-modal')).to.have.length(0);
+    expect(wrapper.find('.control-modal .editor-wrapper')).to.have.length(0);
+  });
+
+  it('should render save event or form event control script editor modal ' +
+    'when controlEventTitleId is null', () => {
+    const controlScript = '';
+    const controlEventTitleId = null;
+    const controlEventTitleName = 'title';
+    wrapper = mount(
+      <ObsControlScriptEditorModal
+        close={closeSpy}
+        script={controlScript}
+        titleId={controlEventTitleId}
+        titleName={controlEventTitleName}
+        updateScript={updateScriptSpy}
+      />);
+    expect(wrapper.find('.control-modal')).to.have.length(1);
+    expect(wrapper.find('.control-modal .label-value')).to.have.length(0);
+  });
+
+  it('should update obs control script editor text when script is passed', () => {
+    const controlScript = 'test';
+    const controlEventTitleId = null;
+    const controlEventTitleName = 'title';
+    codeMirrorStub = sinon.stub(CodeMirror, 'fromTextArea')
+      .callsFake(() => ({ getValue() {return controlScript;}, setValue() {} }));
+    wrapper = mount(
+      <ObsControlScriptEditorModal
+        close={closeSpy}
+        script={controlScript}
+        titleId={controlEventTitleId}
+        titleName={controlEventTitleName}
+        updateScript={updateScriptSpy}
+      />);
+    const instance = wrapper.instance();
+    instance.componentDidUpdate();
+    expect(wrapper.find('.control-modal .editor-wrapper').text()).to.eq(controlScript);
+  });
+
+  it('should update obs control script editor text to empty when script is not passed', () => {
+    const controlEventTitleId = null;
+    const controlEventTitleName = 'title';
+    codeMirrorStub = sinon.stub(CodeMirror, 'fromTextArea')
+      .callsFake(() => ({ getValue() {return '';}, setValue() {} }));
+    wrapper = mount(
+      <ObsControlScriptEditorModal
+        close={closeSpy}
+        titleId={controlEventTitleId}
+        titleName={controlEventTitleName}
+        updateScript={updateScriptSpy}
+      />);
+    const instance = wrapper.instance();
+    instance.componentDidUpdate();
+    expect(wrapper.find('.control-modal .editor-wrapper').text()).to.eq('');
+  });
+});
diff --git a/test/form-builder/helpers/UrlHelper.spec.js b/test/form-builder/helpers/UrlHelper.spec.js
index 3fa3c680..3a80c7e6 100644
--- a/test/form-builder/helpers/UrlHelper.spec.js
+++ b/test/form-builder/helpers/UrlHelper.spec.js
@@ -24,4 +24,24 @@ describe('UrlHelper', () => {
         'formName=name&formVersion=version&locale=locale&formUuid=formUuid';
     expect(conceptRepresentation).to.eql(expectedUrl);
   });
+
+  it('should return form name translate url', () => {
+    const conceptRepresentation = urlHelper.bahmniFormNameTranslateUrl('name', 'formUuid');
+    const expectedUrl = '/openmrs/ws/rest/v1/bahmniie/form/name/translate?' +
+      'formName=name&formUuid=formUuid';
+    expect(conceptRepresentation).to.eql(expectedUrl);
+  });
+
+  it('should return save form name translate url without query parameters', () => {
+    const conceptRepresentation = urlHelper.bahmniSaveFormNameTranslateUrl(null);
+    const expectedUrl = '/openmrs/ws/rest/v1/bahmniie/form/name/saveTranslation';
+    expect(conceptRepresentation).to.eql(expectedUrl);
+  });
+
+  it('should return save form name translate url with query parameters', () => {
+    const conceptRepresentation = urlHelper.bahmniSaveFormNameTranslateUrl('ref-uuid');
+    const expectedUrl = '/openmrs/ws/rest/v1/bahmniie/form/name/saveTranslation?' +
+      'referenceFormUuid=ref-uuid';
+    expect(conceptRepresentation).to.eql(expectedUrl);
+  });
 });
diff --git a/test/form-builder/reducers/controlDetails.spec.js b/test/form-builder/reducers/controlDetails.spec.js
index fa4f9139..9ed7a6d1 100644
--- a/test/form-builder/reducers/controlDetails.spec.js
+++ b/test/form-builder/reducers/controlDetails.spec.js
@@ -4,6 +4,7 @@ import controlDetails from 'form-builder/reducers/controlDetails';
 describe('controlDetails', () => {
   let action = {};
   let expectedStoreState;
+  let allObsControlEvents;
   describe('selectControl', () => {
     beforeEach(() => {
       const metadata = {
@@ -11,6 +12,11 @@ describe('controlDetails', () => {
         concept: {
           uuid: 'someUuid',
           datatype: 'text',
+          name: 'controlName',
+        },
+        id: 1,
+        events: {
+          onValueChange: 'func(){}',
         },
       };
 
@@ -18,20 +24,61 @@ describe('controlDetails', () => {
         type: 'SELECT_CONTROL',
         metadata,
       };
-      expectedStoreState = { selectedControl: metadata };
+      allObsControlEvents = [{ id: action.metadata.id,
+        name: action.metadata.concept !== undefined ? action.metadata.concept.name : undefined,
+        events: action.metadata.events }];
+      expectedStoreState = { allObsControlEvents, selectedControl: metadata };
+    });
+
+    it('should add selected control id to store and add to all controls', () => {
+      const state = controlDetails({ allObsControlEvents }, action);
+      expect(state).to.be.eql(expectedStoreState);
     });
 
-    it('should add selected control id to store', () => {
+    it('should add selected control id to store and assign all controls', () => {
       const state = controlDetails({}, action);
       expect(state).to.be.eql(expectedStoreState);
     });
 
-    it('should update seletected control id', () => {
+    it('should update selected control id', () => {
       const state = controlDetails({ selectedControl: '456' }, action);
       expect(state).to.be.eql(expectedStoreState);
     });
   });
 
+  describe('selectControl_metada_without_concept', () => {
+    beforeEach(() => {
+      const metadata = {
+        type: 'obsControl',
+        id: 1,
+        events: {
+          onValueChange: 'func(){}',
+        },
+      };
+
+      action = {
+        type: 'SELECT_CONTROL',
+        metadata,
+      };
+      allObsControlEvents = [{ id: action.metadata.id,
+        name: undefined,
+        events: action.metadata.events }];
+      expectedStoreState = { allObsControlEvents, selectedControl: metadata };
+    });
+
+    it('should add selected control id to store and assign all controls ' +
+      'when allObsControlEvents are {}', () => {
+      const state = controlDetails({}, action);
+      expect(state).to.be.eql(expectedStoreState);
+    });
+
+    it('should add selected control id to store and assign all controls ' +
+      'when allObsControlEvents are not empty', () => {
+      const state = controlDetails({ allObsControlEvents }, action);
+      expect(state).to.be.eql(expectedStoreState);
+    });
+  });
+
   describe('deselectControl', () => {
     it('should deselect control', () => {
       action = { type: 'DESELECT_CONTROL' };
@@ -83,11 +130,58 @@ describe('controlDetails', () => {
 
   describe('sourceChanged', () => {
     it('should change the source', () => {
-      action = { type: 'SOURCE_CHANGED', source: 'test' };
+      action = { type: 'SOURCE_CHANGED', source: 'test', id: 1 };
+      allObsControlEvents = [{ id: 1, name: 'ob1', events: { onValueChange: '' } },
+        { id: 2, name: 'ob2', events: { onValueChange: '' } }];
 
-      const state = controlDetails({ selectedControl: {} }, action);
+      const state = controlDetails({ allObsControlEvents, selectedControl: {} }, action);
 
       expect(state.selectedControl.events).to.eql({ onValueChange: 'test' });
+      const updatedControl = state.allObsControlEvents.filter(e => e.id === action.id);
+      expect(updatedControl[0].events).to.eql({ onValueChange: 'test' });
+    });
+  });
+
+  describe('formLoad', () => {
+    it('should assign all controls on form load', () => {
+      const controls = [{
+        id: 1,
+        name: 'controlName',
+        events: {
+          onValueChange: 'func(){}',
+        },
+      }];
+      action = {
+        type: 'FORM_LOAD',
+        controls,
+      };
+      const state = controlDetails({}, action);
+      expect(state).to.be.eql({ allObsControlEvents: controls });
+    });
+  });
+
+  describe('deleteControl', () => {
+    beforeEach(() => {
+      const controls = [{
+        id: 1,
+        name: 'controlName',
+        events: {
+          onValueChange: 'func(){}',
+        },
+      }];
+      action = {
+        type: 'DELETE_CONTROL',
+        id: controls[0].id,
+      };
+      allObsControlEvents = [{ id: controls[0].id,
+        name: controls[0].name,
+        events: controls[0].events }];
+      expectedStoreState = { allObsControlEvents };
+    });
+
+    it('should delete selected control on delete control', () => {
+      const state = controlDetails({ allObsControlEvents }, action);
+      expect(state).to.be.eql({ allObsControlEvents: [] });
     });
   });
 });
diff --git a/test/form-builder/reducers/formDetails.spec.js b/test/form-builder/reducers/formDetails.spec.js
index 0aff8a82..3890ebc3 100644
--- a/test/form-builder/reducers/formDetails.spec.js
+++ b/test/form-builder/reducers/formDetails.spec.js
@@ -23,6 +23,13 @@ describe('formDetails', () => {
     expect(state).to.be.eql(expectedStoreState);
   });
 
+  it('should store the changed form observations control events', () => {
+    const action = { events: {}, type: 'FORM_CONDITIONS_CHANGED' };
+    const expectedStoreState = { events: { onFormConditionsUpdate: {} } };
+    const state = formDetails({}, action);
+    expect(state).to.be.eql(expectedStoreState);
+  });
+
   it('should return empty store when no type is passed', () => {
     const action = { events: {}, type: '' };
     const expectedStoreState = { events: { } };