diff --git a/workflow/engine/menus/processes.php b/workflow/engine/menus/processes.php
index e943d0164..9494763d5 100644
--- a/workflow/engine/menus/processes.php
+++ b/workflow/engine/menus/processes.php
@@ -48,4 +48,4 @@ if (ReportTables::tableExist()) {
 $G_TMP_MENU->AddIdRawOption('DB_CONNECTIONS', '', G::LoadTranslation('ID_DB_CONNECTIONS'),"",'showDbConnectionsList(Pm.options.uid); return false;','','ss_sprite ss_database_connect');
 $G_TMP_MENU->AddIdRawOption('CASE_SCHEDULER', '', G::LoadTranslation('ID_CASE_SCHEDULER'), "", 'showCaseSchedulerList(Pm.options.uid); return false;','','ss_sprite ss_calendar_view_day');
 
-$G_TMP_MENU->AddIdRawOption('EDIT_BPMN', '', G::LoadTranslation('ID_EDIT_BPMN'), "", 'showNewProcessMap(Pm.options.uid); return false;','','ss_sprite ss_pencil');
+$G_TMP_MENU->AddIdRawOption('EDIT_BPMN', '', G::LoadTranslation('ID_SWITCH_EDITOR'), "", 'showNewProcessMap(Pm.options.uid); return false;','','ss_sprite ss_pencil');
diff --git a/workflow/engine/templates/bpmn/MyWorkflow.js b/workflow/engine/templates/bpmn/MyWorkflow.js
index 1e10918ba..b91b287ea 100755
--- a/workflow/engine/templates/bpmn/MyWorkflow.js
+++ b/workflow/engine/templates/bpmn/MyWorkflow.js
@@ -692,25 +692,24 @@ MyWorkflow.prototype.AddEventInterContextMenu=function(_4093)
                             scope:_4093,
                             handler: MyWorkflow.prototype.toggleShapes
                         },
-                        {
-                            text: 'Message :  Catch',
-                            type:'bpmnEventMessageRecInter',
-                            scope:_4093,
-                            handler: MyWorkflow.prototype.toggleShapes
-                        },
                         {
                             text: 'Timer',
                             type:'bpmnEventTimerInter',
                             scope:_4093,
                             handler: MyWorkflow.prototype.toggleShapes
-                        },
+                        }
+                        /*
                         {
                             text: 'Intermediate Boundary Timer',
                             type:'bpmnEventBoundaryInter',
                             scope:_4093,
                             handler: MyWorkflow.prototype.toggleShapes
-                        }
-                        /*, {
+                        },{
+                            text: 'Message :  Catch',
+                            type:'bpmnEventMessageRecInter',
+                            scope:_4093,
+                            handler: MyWorkflow.prototype.toggleShapes
+                        }, {
                             text: 'Compensate',
                             type:'bpmnEventCompInter',
                             scope:_4093,
diff --git a/workflow/engine/templates/bpmn/designer.js b/workflow/engine/templates/bpmn/designer.js
index 8afedf11d..109d078bd 100755
--- a/workflow/engine/templates/bpmn/designer.js
+++ b/workflow/engine/templates/bpmn/designer.js
@@ -585,7 +585,6 @@ Ext.onReady ( function() {
       items: [{
           text: 'Edit Process',
           handler: ProcessMapObj.editProcess,
-          //icon: '/skins/ext/images/gray/shapes/more.gif',
           iconCls: 'button_menu_ext ss_sprite ss_page_white_edit',
           scope: this
       }, {
diff --git a/workflow/engine/templates/bpmn/processmap.js b/workflow/engine/templates/bpmn/processmap.js
index ec3a5f290..86c549226 100755
--- a/workflow/engine/templates/bpmn/processmap.js
+++ b/workflow/engine/templates/bpmn/processmap.js
@@ -264,7 +264,7 @@ Ext.onReady ( function() {
           ]
         })
       },{
-        text:'Edit Process',
+        text: _('ID_SWITCH_EDITOR'),
         iconCls: 'button_menu_ext ss_sprite ss_pencil',
         handler: function() {
           if(typeof pro_uid !== 'undefined') {