diff --git a/forms-flow-web/src/actions/actionConstants.js b/forms-flow-web/src/actions/actionConstants.js
index 089d1ba6bf..b46ba40759 100644
--- a/forms-flow-web/src/actions/actionConstants.js
+++ b/forms-flow-web/src/actions/actionConstants.js
@@ -137,6 +137,7 @@ const ACTION_CONSTANTS = {
   BPMN_SEARCH_TEXT: "BPMN_SEARCH_TEXT",
   DMN_SEARCH_TEXT: "DMN_SEARCH_TEXT",
   IS_BPMN_MODEL: "IS_BPMN_MODEL",
+  IS_PUBLIC_DIAGRAM: "IS_PUBLIC_DIAGRAM",
   //BPM FORMS
   BPM_FORM_LIST: "BPM_FORM_LIST",
   IS_BPM_FORM_LIST_LOADING: "IS_BPM_FORM_LIST_LOADING",
diff --git a/forms-flow-web/src/actions/processActions.js b/forms-flow-web/src/actions/processActions.js
index 0e50903bb7..146a0f9e90 100644
--- a/forms-flow-web/src/actions/processActions.js
+++ b/forms-flow-web/src/actions/processActions.js
@@ -154,4 +154,11 @@ export const setBpmnModel = (data) => (dispatch) => {
     type: ACTION_CONSTANTS.IS_BPMN_MODEL,
     payload: data,
   });
+};
+
+export const setIsPublicDiagram = (data) => (dispatch) => {
+  dispatch({
+    type: ACTION_CONSTANTS.IS_PUBLIC_DIAGRAM,
+    payload: data,
+  });
 };
\ No newline at end of file
diff --git a/forms-flow-web/src/components/Form/List.scss b/forms-flow-web/src/components/Form/List.scss
index f20b4fcd13..d247a2b7f1 100644
--- a/forms-flow-web/src/components/Form/List.scss
+++ b/forms-flow-web/src/components/Form/List.scss
@@ -12,19 +12,18 @@
 }
 
 .published-forms-label{
-    color: #2F6846;
+    color: #52C41A;
     background: #EAFBE7 0% 0% no-repeat padding-box;
-    border: 1px solid #C6F0C2;
+    border: 1px solid #52C41A;
     border-radius: 7px;
 }
 
 .unpublished-forms-label{
-    background: #EAF5FF 0% 0% no-repeat padding-box;
+    background: #E6F7FF 0% 0% no-repeat padding-box;
     border-radius: 7px;
-    border: 1px solid #B8E1FF;
-    color: #006096;
+    border: 1px solid #91D5FF;
+    color: #1890FF;
 }
-
 .custom-grid {
     .col {
         min-height: 50px;
diff --git a/forms-flow-web/src/components/Modeler/Create.js b/forms-flow-web/src/components/Modeler/Create.js
index 494ac2d00a..ada16e44a0 100644
--- a/forms-flow-web/src/components/Modeler/Create.js
+++ b/forms-flow-web/src/components/Modeler/Create.js
@@ -43,7 +43,7 @@ import {
             />
           ) : (
             <DmnEditor 
-            mode="Create"
+              mode="Create"
               processKey={''}
               tenant={''}
               isNewDiagram={true}
diff --git a/forms-flow-web/src/components/Modeler/Edit.js b/forms-flow-web/src/components/Modeler/Edit.js
index 9d15eee653..4acc2a161a 100644
--- a/forms-flow-web/src/components/Modeler/Edit.js
+++ b/forms-flow-web/src/components/Modeler/Edit.js
@@ -4,30 +4,41 @@ import BpmnEditor from './Editors/BpmnEditor';
 import { useParams } from "react-router-dom";
 import DmnEditor from './Editors/DmnEditor';
 import { useDispatch } from 'react-redux';
+import { push } from "connected-react-router";
 import {
     fetchDiagram,
   } from "../../apiManager/services/processServices";
  import Loading from '../../containers/Loading';
-import { setProcessDiagramXML } from '../../actions/processActions';
+import { setIsPublicDiagram, setProcessDiagramXML } from '../../actions/processActions';
+import { MULTITENANCY_ENABLED } from '../../constants/constants';
+
 const EditWorkflow = () => {
     //select typeOf workflow form useSelector / redux
-     const tenantKey = useSelector((state) => state.tenants?.tenantId);
+    const tenantKey = useSelector((state) => state.tenants?.tenantId);
     const {processId, type} = useParams(); 
     const dispatch = useDispatch();
     const [diagramLoading, setDiagramLoading] = useState(false);
-     const diagramXML = useSelector((state) => state.process.processDiagramXML);
- 
+    const diagramXML = useSelector((state) => state.process.processDiagramXML);
+    const isPublicDiagram = useSelector((state) => state.process.isPublicDiagram);
+    const redirectUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : "/";
 
     useEffect(()=>{
       setDiagramLoading(true);
-         dispatch(fetchDiagram(processId, tenantKey, type === "bpmn" ? false : true,()=>{
-          setDiagramLoading(false);
-         }));
+      if(MULTITENANCY_ENABLED && isPublicDiagram === null){
+        dispatch(push(`${redirectUrl}processes`));
+      }
+      else{
+        const updatedTenantKey = (MULTITENANCY_ENABLED && !isPublicDiagram) ? null : tenantKey;
+        dispatch(fetchDiagram(processId,updatedTenantKey, type === "bpmn" ? false : true,()=>{
+         setDiagramLoading(false);
+        }));
+      }  
     },[processId]);
 
     useEffect(()=>{
       return () => {
         dispatch(setProcessDiagramXML(''));
+        dispatch(setIsPublicDiagram(null));
       };
     },[]);
 
@@ -39,20 +50,22 @@ const EditWorkflow = () => {
     <div>
  
          {type === "bpmn" ? (
+            diagramXML ?
             <BpmnEditor
-            mode="Edit"
+              mode="Edit"
               processKey={processId}
               tenant={tenantKey}
               isNewDiagram={false}
               bpmnXml={diagramXML}
-            />
+            /> :  null
           ) : (
+            diagramXML ?
             <DmnEditor
-            mode="Edit"
+              mode="Edit"
               processKey={processId}
               tenant={tenantKey}
               isNewDiagram={false}
-            />
+            /> : null
           )}
     </div>
   );
diff --git a/forms-flow-web/src/components/Modeler/Editors/BpmnEditor/index.js b/forms-flow-web/src/components/Modeler/Editors/BpmnEditor/index.js
index 11efdb1c00..5bd5f12689 100644
--- a/forms-flow-web/src/components/Modeler/Editors/BpmnEditor/index.js
+++ b/forms-flow-web/src/components/Modeler/Editors/BpmnEditor/index.js
@@ -108,7 +108,7 @@ export default React.memo(
       if (diagramXML) {
         dispatch(setProcessDiagramLoading(true));
         dispatch(setProcessDiagramXML(diagramXML));
-      } else if (processKey && !isNewDiagram) {
+      } else if (processKey && !isNewDiagram && !bpmnXml) {
         dispatch(setProcessDiagramLoading(true));
         dispatch(fetchDiagram(processKey, tenant));
       } else {
@@ -302,7 +302,7 @@ export default React.memo(
           <div>
             <h3 className="d-flex align-items-center font-weight-bold">
               <i className="fa fa-cogs mr-2" aria-hidden="true" />
-              <span>{t(`${mode} Processes`)}</span>
+              <span>{t(`${mode} Process`)}</span>
             </h3>
           </div>
 
@@ -314,7 +314,7 @@ export default React.memo(
                   checked={applyAllTenants}
                   onClick={handleApplyAllTenants}
                 />{" "}
-                Apply for all tenants
+                {t("Apply for all tenants")}
               </label>
             ) : null}
 
diff --git a/forms-flow-web/src/components/Modeler/Editors/DmnEditor/index.js b/forms-flow-web/src/components/Modeler/Editors/DmnEditor/index.js
index a96727cd52..f491cafd17 100644
--- a/forms-flow-web/src/components/Modeler/Editors/DmnEditor/index.js
+++ b/forms-flow-web/src/components/Modeler/Editors/DmnEditor/index.js
@@ -265,7 +265,7 @@ export default React.memo(({ processKey, tenant, isNewDiagram, mode}) => {
         <div>
           <h3 className="d-flex align-items-center font-weight-bold">
             <i className="fa fa-cogs mr-2" aria-hidden="true" />
-            <span>{t(`${mode} Processes`)}</span>
+            <span>{t(`${mode} Dmn`)}</span>
           </h3>
         </div>
         <div className="task-head d-flex justify-content-end mb-2">
@@ -276,7 +276,7 @@ export default React.memo(({ processKey, tenant, isNewDiagram, mode}) => {
                 checked={applyAllTenants}
                 onClick={handleApplyAllTenants}
               />{" "}
-              Apply for all tenants
+              {t("Apply for all tenants")}
             </label>
           ) : null}
           <button type="button"
diff --git a/forms-flow-web/src/components/Modeler/Editors/Editor.scss b/forms-flow-web/src/components/Modeler/Editors/Editor.scss
index e5199ed7e8..e801a3af18 100644
--- a/forms-flow-web/src/components/Modeler/Editors/Editor.scss
+++ b/forms-flow-web/src/components/Modeler/Editors/Editor.scss
@@ -49,6 +49,8 @@
 
 .deploy-checkbox {
   margin-right: 15px;
+  font-size: 16px;
+  margin-top: 7px;
 }
 
 // Override bpmn-js-properties-panel style for removing entry (trash can)
diff --git a/forms-flow-web/src/components/Modeler/constants/bpmnTable.js b/forms-flow-web/src/components/Modeler/constants/bpmnTable.js
index 5f75374b28..5506cebf40 100644
--- a/forms-flow-web/src/components/Modeler/constants/bpmnTable.js
+++ b/forms-flow-web/src/components/Modeler/constants/bpmnTable.js
@@ -8,9 +8,9 @@ import {
   fetchAllBpmProcessesCount,
 } from "../../../apiManager/services/processServices";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
 import { MULTITENANCY_ENABLED } from "../../../constants/constants";
-import { setBpmnSearchText } from "../../../actions/processActions";
+import { setBpmnSearchText, setIsPublicDiagram } from "../../../actions/processActions";
+import { push } from "connected-react-router";
 function BpmnTable() {
   const dispatch = useDispatch();
   const process = useSelector((state) => state.process.processList);
@@ -74,6 +74,13 @@ function BpmnTable() {
     dispatch(setBpmnSearchText(""));
     setActivePage(1);
   };
+ 
+  const gotoEdit = (data) => {
+    if(MULTITENANCY_ENABLED){
+      dispatch(setIsPublicDiagram(data.tenantId ? true : false));
+    }
+   dispatch(push(`${redirectUrl}processes/bpmn/${data.key}/edit`));
+  };
 
   const pageOptions = [
     { text: "5", value: 5 },
@@ -152,12 +159,9 @@ function BpmnTable() {
                     <td>{processItem.key}</td>
                     <td>{t("BPMN")}</td>
                     <td className="d-flex justify-content-end w-100">
-                      <Link
-                        to={`${redirectUrl}processes/bpmn/${processItem.key}/edit`}
-                      > 
-                      <i className="fas fa-edit mr-2"/>
-                        {t("Edit Workflow")}
-                      </Link>
+                      <button className="btn btn-link" onClick={()=>{gotoEdit(processItem);}}> 
+                       <i className="fas fa-edit mr-2"/>
+                        {t("Edit Workflow")}</button>
                     </td>
                   </tr>
                 ))}
diff --git a/forms-flow-web/src/components/Modeler/constants/dmnTable.js b/forms-flow-web/src/components/Modeler/constants/dmnTable.js
index a40d95b416..817bbc44ea 100644
--- a/forms-flow-web/src/components/Modeler/constants/dmnTable.js
+++ b/forms-flow-web/src/components/Modeler/constants/dmnTable.js
@@ -10,9 +10,10 @@ import {
   fetchAllDmnProcessesCount,
 } from "../../../apiManager/services/processServices";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
 import { MULTITENANCY_ENABLED } from "../../../constants/constants";
-import { setDmnSearchText } from "../../../actions/processActions";
+import { setDmnSearchText,setIsPublicDiagram } from "../../../actions/processActions";
+import { push } from "connected-react-router";
+
 function DmnTable() {
   const dispatch = useDispatch();
   const dmn = useSelector((state) => state.process?.dmnProcessList);
@@ -77,6 +78,13 @@ function DmnTable() {
     setActivePage(1);
   };
 
+  const gotoEdit = (data) => {
+    if(MULTITENANCY_ENABLED){
+      dispatch(setIsPublicDiagram(data.tenantId ? true : false));
+    }
+   dispatch(push(`${redirectUrl}processes/dmn/${data.key}/edit`));
+  };
+
   const pageOptions = [
     { text: "5", value: 5 },
     { text: "10", value: 10 },
@@ -141,7 +149,7 @@ function DmnTable() {
                     style={{ height: "300px" }}
                     className="text-center"
                   >
-                   { isLoading ? null : t("No Process Found")}
+                   { isLoading ? null : t("No Dmn Found")}
                   </td>
                 </tr>
               </tbody>
@@ -153,12 +161,9 @@ function DmnTable() {
                     <td>{processItem.key}</td>
                     <td>{t("DMN")}</td>
                     <td className="d-flex justify-content-end w-100">
-                      <Link
-                        to={`${redirectUrl}processes/dmn/${processItem.key}/edit`}
-                      >
-                        <i className="fas fa-edit mr-2"/>
-                        {t("Edit Workflow")}
-                      </Link>
+                    <button className="btn btn-link" onClick={()=>{gotoEdit(processItem);}}> 
+                       <i className="fas fa-edit mr-2"/>
+                        {t("Edit Workflow")}</button>
                     </td>
                   </tr>
                 ))}
diff --git a/forms-flow-web/src/modules/processReducer.js b/forms-flow-web/src/modules/processReducer.js
index c11305553a..ddbba565d0 100644
--- a/forms-flow-web/src/modules/processReducer.js
+++ b/forms-flow-web/src/modules/processReducer.js
@@ -24,7 +24,7 @@ const initialState = {
   isBpmnModel:true,
   bpmnSearchText:"",
   dmnSearchText:"",
-  
+  isPublicDiagram:null,
 };
 
 const process = (state = initialState, action) => {
@@ -95,6 +95,8 @@ const process = (state = initialState, action) => {
         return { ...state, bpmnSearchText: action.payload };
     case ACTION_CONSTANTS.DMN_SEARCH_TEXT:
         return { ...state, dmnSearchText: action.payload };
+    case ACTION_CONSTANTS.IS_PUBLIC_DIAGRAM:
+        return { ...state, isPublicDiagram: action.payload };
     default:
       return state;
   }
diff --git a/forms-flow-web/src/styles.scss b/forms-flow-web/src/styles.scss
index 8ff0033015..eb1044aabe 100644
--- a/forms-flow-web/src/styles.scss
+++ b/forms-flow-web/src/styles.scss
@@ -143,7 +143,7 @@ body {
 }
 
 .page-item.active .page-link {
-  background-color: #036 !important;
+  background-color:  #4183c4 !important;
   border-color: #56595d !important;
 }