diff --git a/workflow/engine/templates/bpmn/Annotation.js b/workflow/engine/templates/bpmn/Annotation.js
index 449b253f2..f7759f467 100755
--- a/workflow/engine/templates/bpmn/Annotation.js
+++ b/workflow/engine/templates/bpmn/Annotation.js
@@ -1,10 +1,16 @@
 bpmnAnnotation = function (_30ab ) {
     VectorFigure.call(this);
-    if(typeof _30ab.anno_width != 'undefined' && typeof _30ab.anno_height != 'undefined')
+   //Getting width and height from DB
+   if(typeof _30ab.anno_width != 'undefined' && typeof _30ab.anno_height != 'undefined')
         this.setDimension(_30ab.anno_width, _30ab.anno_height);
-    else
-    this.setDimension(110, 60);
-    this.setAnnotationName(_30ab.annotationName); //It will set the Default Task Name with appropriate count While dragging a task on the canvas
+   else
+        this.setDimension(110, 60);
+
+   //Setting width and height values as per the zoom ratio
+   if(typeof workflow.zoomAnnotationWidth != 'undefined' || typeof workflow.zoomAnnotationHeight != 'undefined')
+        this.setDimension(workflow.zoomAnnotationWidth, workflow.zoomAnnotationHeight);
+
+   this.setAnnotationName(_30ab.annotationName); //It will set the Default Task Name with appropriate count While dragging a task on the canvas
 };
 
 bpmnAnnotation.prototype = new VectorFigure;
@@ -82,7 +88,14 @@ bpmnAnnotation.prototype.paint = function () {
     var padtop = 0.18*this.getHeight();
     var rectwidth = this.getWidth() - padleft;
     var rectheight = this.getHeight() - 2*padtop;
-    this.bpmnText.setFont('verdana', '11px', Font.PLAIN);
+
+    //Setting text size to zoom font size if Zoomed
+    if(typeof workflow.zoomAnnotationTextSize != 'undefined')
+        var fontSize = workflow.zoomAnnotationTextSize;
+    else
+        fontSize = '11px';
+
+    this.bpmnText.setFont('verdana', fontSize, Font.PLAIN);
     this.bpmnText.drawStringAnno(this.annotationName,0,padtop,rectwidth,rectheight,'left');
     //bpmnText.drawStringRect(this.taskName,this.getWidth()/2-20,this.getHeight()/2-11,200,'left');
     //tempcoord = this.coord_converter(this.getWidth(), this.getHeight(), this.taskName.length);
diff --git a/workflow/engine/templates/bpmn/EventBoundaryTimerInter.js b/workflow/engine/templates/bpmn/EventBoundaryTimerInter.js
index e630994da..680f746fb 100755
--- a/workflow/engine/templates/bpmn/EventBoundaryTimerInter.js
+++ b/workflow/engine/templates/bpmn/EventBoundaryTimerInter.js
@@ -1,6 +1,10 @@
 bpmnEventBoundaryTimerInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+      this.setDimension(30,30);
 this.stroke = 2;
 };
 bpmnEventBoundaryTimerInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventCancelEnd.js b/workflow/engine/templates/bpmn/EventCancelEnd.js
index 42bc306d8..014a07236 100755
--- a/workflow/engine/templates/bpmn/EventCancelEnd.js
+++ b/workflow/engine/templates/bpmn/EventCancelEnd.js
@@ -1,6 +1,10 @@
 bpmnEventCancelEnd=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=3;
 };
 bpmnEventCancelEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventCancelInter.js b/workflow/engine/templates/bpmn/EventCancelInter.js
index 099f658c8..44ee84fb6 100755
--- a/workflow/engine/templates/bpmn/EventCancelInter.js
+++ b/workflow/engine/templates/bpmn/EventCancelInter.js
@@ -1,6 +1,10 @@
 bpmnEventCancelInter=function(){
 VectorFigure.call(this);
-this.setDimension(45,45);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(45,45);
 this.stroke=2;
 };
 bpmnEventCancelInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventCompEnd.js b/workflow/engine/templates/bpmn/EventCompEnd.js
index 9f514ac84..86bda85f3 100755
--- a/workflow/engine/templates/bpmn/EventCompEnd.js
+++ b/workflow/engine/templates/bpmn/EventCompEnd.js
@@ -1,6 +1,10 @@
 bpmnEventCompEnd=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=3
 };
 bpmnEventCompEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventCompInter.js b/workflow/engine/templates/bpmn/EventCompInter.js
index 9b511313f..1c5d80569 100755
--- a/workflow/engine/templates/bpmn/EventCompInter.js
+++ b/workflow/engine/templates/bpmn/EventCompInter.js
@@ -1,6 +1,10 @@
 bpmnEventCompInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2
 };
 bpmnEventCompInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventEmptyEnd.js b/workflow/engine/templates/bpmn/EventEmptyEnd.js
index 3c5483852..c42b2a48b 100755
--- a/workflow/engine/templates/bpmn/EventEmptyEnd.js
+++ b/workflow/engine/templates/bpmn/EventEmptyEnd.js
@@ -1,6 +1,10 @@
 bpmnEventEmptyEnd=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=3;
 };
 bpmnEventEmptyEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventEmptyInter.js b/workflow/engine/templates/bpmn/EventEmptyInter.js
index c6db38e72..e922e4873 100755
--- a/workflow/engine/templates/bpmn/EventEmptyInter.js
+++ b/workflow/engine/templates/bpmn/EventEmptyInter.js
@@ -1,6 +1,10 @@
 bpmnEventEmptyInter=function(width,_30ab){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventEmptyInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventEmptyStart.js b/workflow/engine/templates/bpmn/EventEmptyStart.js
index 62de3fd11..80614cf73 100755
--- a/workflow/engine/templates/bpmn/EventEmptyStart.js
+++ b/workflow/engine/templates/bpmn/EventEmptyStart.js
@@ -1,6 +1,10 @@
 bpmnEventEmptyStart=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventEmptyStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventEndSignal.js b/workflow/engine/templates/bpmn/EventEndSignal.js
index ca8022a81..db69dccae 100755
--- a/workflow/engine/templates/bpmn/EventEndSignal.js
+++ b/workflow/engine/templates/bpmn/EventEndSignal.js
@@ -1,6 +1,10 @@
 bpmnEventEndSignal=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventEndSignal.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventErrorEnd.js b/workflow/engine/templates/bpmn/EventErrorEnd.js
index 96195a509..1269f803d 100755
--- a/workflow/engine/templates/bpmn/EventErrorEnd.js
+++ b/workflow/engine/templates/bpmn/EventErrorEnd.js
@@ -1,6 +1,10 @@
 bpmnEventErrorEnd=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=4;
 };
 bpmnEventErrorEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventErrorInter.js b/workflow/engine/templates/bpmn/EventErrorInter.js
index 4e0d368dd..af1bf723f 100755
--- a/workflow/engine/templates/bpmn/EventErrorInter.js
+++ b/workflow/engine/templates/bpmn/EventErrorInter.js
@@ -1,6 +1,10 @@
 bpmnEventErrorInter=function(){
 VectorFigure.call(this);
-this.setDimension(45,45);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(45,45);
 this.stroke=2;
 };
 bpmnEventErrorInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventInterSignal.js b/workflow/engine/templates/bpmn/EventInterSignal.js
index 877906e6b..34c73fb7d 100755
--- a/workflow/engine/templates/bpmn/EventInterSignal.js
+++ b/workflow/engine/templates/bpmn/EventInterSignal.js
@@ -1,6 +1,10 @@
 bpmnEventInterSignal=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventInterSignal.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventLinkEnd.js b/workflow/engine/templates/bpmn/EventLinkEnd.js
index f354ccca1..0ddc4eb74 100755
--- a/workflow/engine/templates/bpmn/EventLinkEnd.js
+++ b/workflow/engine/templates/bpmn/EventLinkEnd.js
@@ -1,6 +1,10 @@
 bpmnEventLinkEnd=function(){
 VectorFigure.call(this);
-this.setDimension(45,45);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(45,45);
 this.stroke=3;
 };
 bpmnEventLinkEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventLinkInter.js b/workflow/engine/templates/bpmn/EventLinkInter.js
index a40863b56..093c0e131 100755
--- a/workflow/engine/templates/bpmn/EventLinkInter.js
+++ b/workflow/engine/templates/bpmn/EventLinkInter.js
@@ -1,6 +1,10 @@
 bpmnEventLinkInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventLinkInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventLinkStart.js b/workflow/engine/templates/bpmn/EventLinkStart.js
index ce6cf664e..23797ce33 100755
--- a/workflow/engine/templates/bpmn/EventLinkStart.js
+++ b/workflow/engine/templates/bpmn/EventLinkStart.js
@@ -1,6 +1,10 @@
 bpmnEventLinkStart=function(){
 VectorFigure.call(this);
-this.setDimension(45,45);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(45,45);
 this.stroke=2
 };
 bpmnEventLinkStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMessageEnd.js b/workflow/engine/templates/bpmn/EventMessageEnd.js
index 25acaa2d3..f4aa165ca 100755
--- a/workflow/engine/templates/bpmn/EventMessageEnd.js
+++ b/workflow/engine/templates/bpmn/EventMessageEnd.js
@@ -1,6 +1,10 @@
 bpmnEventMessageEnd=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke = 3;
 };
 bpmnEventMessageEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMessageInter.js b/workflow/engine/templates/bpmn/EventMessageInter.js
index a8282240b..f6f4a6495 100755
--- a/workflow/engine/templates/bpmn/EventMessageInter.js
+++ b/workflow/engine/templates/bpmn/EventMessageInter.js
@@ -1,6 +1,10 @@
 bpmnEventMessageInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventMessageInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMessageRecInter.js b/workflow/engine/templates/bpmn/EventMessageRecInter.js
index 5dac553be..4c3db66f5 100755
--- a/workflow/engine/templates/bpmn/EventMessageRecInter.js
+++ b/workflow/engine/templates/bpmn/EventMessageRecInter.js
@@ -1,6 +1,10 @@
 bpmnEventMessageRecInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventMessageRecInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMessageSendInter.js b/workflow/engine/templates/bpmn/EventMessageSendInter.js
index 69b4213b1..b7ebd2443 100755
--- a/workflow/engine/templates/bpmn/EventMessageSendInter.js
+++ b/workflow/engine/templates/bpmn/EventMessageSendInter.js
@@ -1,6 +1,10 @@
 bpmnEventMessageSendInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventMessageSendInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMessageStart.js b/workflow/engine/templates/bpmn/EventMessageStart.js
index 6cb1fa7de..73febb8ec 100755
--- a/workflow/engine/templates/bpmn/EventMessageStart.js
+++ b/workflow/engine/templates/bpmn/EventMessageStart.js
@@ -1,6 +1,10 @@
 bpmnEventMessageStart=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke = 3;
 };
 bpmnEventMessageStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMulStart.js b/workflow/engine/templates/bpmn/EventMulStart.js
index d6ac1d6c4..9f1856d43 100755
--- a/workflow/engine/templates/bpmn/EventMulStart.js
+++ b/workflow/engine/templates/bpmn/EventMulStart.js
@@ -1,6 +1,10 @@
 bpmnEventMulStart=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke= 2;
 };
 bpmnEventMulStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMultipleEnd.js b/workflow/engine/templates/bpmn/EventMultipleEnd.js
index 52dee62a9..8a90e1f34 100755
--- a/workflow/engine/templates/bpmn/EventMultipleEnd.js
+++ b/workflow/engine/templates/bpmn/EventMultipleEnd.js
@@ -1,6 +1,10 @@
 bpmnEventMultipleEnd=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventMultipleEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventMultipleInter.js b/workflow/engine/templates/bpmn/EventMultipleInter.js
index 12ca447c5..24ccf7a83 100755
--- a/workflow/engine/templates/bpmn/EventMultipleInter.js
+++ b/workflow/engine/templates/bpmn/EventMultipleInter.js
@@ -1,6 +1,10 @@
 bpmnEventMultipleInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2
 };
 bpmnEventMultipleInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventRuleInter.js b/workflow/engine/templates/bpmn/EventRuleInter.js
index 55319f2e7..c8b613749 100755
--- a/workflow/engine/templates/bpmn/EventRuleInter.js
+++ b/workflow/engine/templates/bpmn/EventRuleInter.js
@@ -1,6 +1,10 @@
 bpmnEventRuleInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke = 2;
 };
 bpmnEventRuleInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventRuleStart.js b/workflow/engine/templates/bpmn/EventRuleStart.js
index 80e55083d..ebed18558 100755
--- a/workflow/engine/templates/bpmn/EventRuleStart.js
+++ b/workflow/engine/templates/bpmn/EventRuleStart.js
@@ -1,6 +1,10 @@
 bpmnEventRuleStart=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke = 2;
 };
 bpmnEventRuleStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventSignalStart.js b/workflow/engine/templates/bpmn/EventSignalStart.js
index 0be3ec93a..1af578206 100755
--- a/workflow/engine/templates/bpmn/EventSignalStart.js
+++ b/workflow/engine/templates/bpmn/EventSignalStart.js
@@ -1,6 +1,10 @@
 bpmnEventSignalStart=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventSignalStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventTerminateEnd.js b/workflow/engine/templates/bpmn/EventTerminateEnd.js
index 5a62a4350..f5f23f41e 100755
--- a/workflow/engine/templates/bpmn/EventTerminateEnd.js
+++ b/workflow/engine/templates/bpmn/EventTerminateEnd.js
@@ -1,6 +1,10 @@
 bpmnEventTerminate=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke=2;
 };
 bpmnEventTerminate.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventTimerInter.js b/workflow/engine/templates/bpmn/EventTimerInter.js
index 168c6f54d..17dbc9393 100755
--- a/workflow/engine/templates/bpmn/EventTimerInter.js
+++ b/workflow/engine/templates/bpmn/EventTimerInter.js
@@ -1,6 +1,10 @@
 bpmnEventTimerInter=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke = 2;
 };
 bpmnEventTimerInter.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventTimerStart.js b/workflow/engine/templates/bpmn/EventTimerStart.js
index d036d9e4f..18ef084a1 100755
--- a/workflow/engine/templates/bpmn/EventTimerStart.js
+++ b/workflow/engine/templates/bpmn/EventTimerStart.js
@@ -1,6 +1,10 @@
 bpmnEventTimerStart=function(){
 VectorFigure.call(this);
-this.setDimension(30,30);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
+else
+    this.setDimension(30,30);
 this.stroke = 2;
 };
 bpmnEventTimerStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/GatewayComplex.js b/workflow/engine/templates/bpmn/GatewayComplex.js
index 09344db12..ed64147d0 100755
--- a/workflow/engine/templates/bpmn/GatewayComplex.js
+++ b/workflow/engine/templates/bpmn/GatewayComplex.js
@@ -1,6 +1,10 @@
 bpmnGatewayComplex=function(width,_30ab){
 VectorFigure.call(this);
-this.setDimension(40,40);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth+10, workflow.zoomHeight+10);
+else
+    this.setDimension(40,40);
 this.stroke=2;
 };
 bpmnGatewayComplex.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/GatewayExclusiveData.js b/workflow/engine/templates/bpmn/GatewayExclusiveData.js
index 8c45c58de..87c1c476b 100755
--- a/workflow/engine/templates/bpmn/GatewayExclusiveData.js
+++ b/workflow/engine/templates/bpmn/GatewayExclusiveData.js
@@ -1,7 +1,11 @@
 bpmnGatewayExclusiveData=function(width,_30ab){
 VectorFigure.call(this);
 this.stroke =2;
-this.setDimension(40,40);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth+10, workflow.zoomHeight+10);
+else
+    this.setDimension(40,40);
 };
 bpmnGatewayExclusiveData.prototype=new VectorFigure;
 bpmnGatewayExclusiveData.prototype.type="bpmnGatewayExclusiveData";
diff --git a/workflow/engine/templates/bpmn/GatewayExclusiveEvent.js b/workflow/engine/templates/bpmn/GatewayExclusiveEvent.js
index 9fa426eae..eb81a338a 100755
--- a/workflow/engine/templates/bpmn/GatewayExclusiveEvent.js
+++ b/workflow/engine/templates/bpmn/GatewayExclusiveEvent.js
@@ -1,6 +1,10 @@
 bpmnGatewayExclusiveEvent=function(width,_30ab){
 VectorFigure.call(this);
-this.setDimension(40,40);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth+10, workflow.zoomHeight+10);
+else
+    this.setDimension(40,40);
 this.stroke=2;
 };
 bpmnGatewayExclusiveEvent.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/GatewayInclusive.js b/workflow/engine/templates/bpmn/GatewayInclusive.js
index fa4de02c1..072fba005 100755
--- a/workflow/engine/templates/bpmn/GatewayInclusive.js
+++ b/workflow/engine/templates/bpmn/GatewayInclusive.js
@@ -1,6 +1,10 @@
 bpmnGatewayInclusive=function(width,_30ab){
 VectorFigure.call(this);
-this.setDimension(40,40);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth+10, workflow.zoomHeight+10);
+else
+    this.setDimension(40,40);
 };
 bpmnGatewayInclusive.prototype=new VectorFigure;
 bpmnGatewayInclusive.prototype.type="bpmnGatewayInclusive";
diff --git a/workflow/engine/templates/bpmn/GatewayParallel.js b/workflow/engine/templates/bpmn/GatewayParallel.js
index b19e33ecb..b619b78b3 100755
--- a/workflow/engine/templates/bpmn/GatewayParallel.js
+++ b/workflow/engine/templates/bpmn/GatewayParallel.js
@@ -1,6 +1,10 @@
 bpmnGatewayParallel=function(width,_30ab){
 VectorFigure.call(this);
-this.setDimension(40,40);
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
+      this.setDimension(workflow.zoomWidth+10, workflow.zoomHeight+10);
+else
+    this.setDimension(40,40);
 };
 bpmnGatewayParallel.prototype=new VectorFigure;
 bpmnGatewayParallel.prototype.type="bpmnGatewayParallel";
diff --git a/workflow/engine/templates/bpmn/MyWorkflow.js b/workflow/engine/templates/bpmn/MyWorkflow.js
index 2f0b7d420..2a9da8b51 100755
--- a/workflow/engine/templates/bpmn/MyWorkflow.js
+++ b/workflow/engine/templates/bpmn/MyWorkflow.js
@@ -2128,7 +2128,7 @@ MyWorkflow.prototype.zoom = function(sType)
 {
    var figures = workflow.getDocument().getFigures();
 
-    var lines=workflow.getLines();
+   var lines=workflow.getLines();
    var size=lines.getSize();
    for(var i=0;i<size;i++){
        var startX = lines.data[i].startX;
@@ -2172,11 +2172,22 @@ MyWorkflow.prototype.zoom = function(sType)
           {
               width  += 5;
               height += 5;
+              workflow.zoomWidth  = width;
+              workflow.zoomHeight = height;
+          }
+        else if(fig.type.match(/Annotation/))
+          {
+             width  += 20;
+             height += 20;
+             workflow.zoomAnnotationWidth  = width;
+             workflow.zoomAnnotationHeight = height;
           }
         else
           {
              width  += 20;
              height += 20;
+             workflow.zoomTaskWidth  = width;
+             workflow.zoomTaskHeight = height;
           }
      }
     else
@@ -2185,15 +2196,26 @@ MyWorkflow.prototype.zoom = function(sType)
           {
               width  -= 5;
               height -= 5;
+              workflow.zoomWidth  = width;
+              workflow.zoomHeight = height;
+          }
+        else if(fig.type.match(/Annotation/))
+          {
+             width  -= 20;
+             height -= 20;
+             workflow.zoomAnnotationWidth  = width;
+             workflow.zoomAnnotationHeight = height;
           }
         else
           {
              width  -= 20;
              height -= 20;
+             workflow.zoomTaskWidth  = width;
+             workflow.zoomTaskHeight = height;
           }
      }
 
-     
+
 
    if(sType == 'in' && fig.type != 'bpmnAnnotation')
        {
@@ -2235,7 +2257,7 @@ MyWorkflow.prototype.zoom = function(sType)
         //Setting font minimum limit
         if(fig.size < 11)
             fig.size = 11;
-
+        workflow.zoomTaskTextSize = fig.size;
         eval("fig.bpmnText.setFont('verdana','"+fig.size+"px', Font.PLAIN)");
         fig.bpmnText.drawStringRect(fig.taskName, padleft, padtop, fig.rectWidth, rectheight, 'center');
         fig.bpmnText.paint();
@@ -2269,6 +2291,7 @@ MyWorkflow.prototype.zoom = function(sType)
           if(fig.size < 11)
             fig.size = 11;
 
+          workflow.zoomAnnotationTextSize = fig.size;
           eval("fig.bpmnText.setFont('verdana','"+fig.size+"px', Font.PLAIN)");
           fig.bpmnText.drawStringRect(text,20,20,fig.rectWidth,'left');
           fig.bpmnText.paint();
diff --git a/workflow/engine/templates/bpmn/ProcessMapContext.js b/workflow/engine/templates/bpmn/ProcessMapContext.js
index 5ce118342..dd206521f 100755
--- a/workflow/engine/templates/bpmn/ProcessMapContext.js
+++ b/workflow/engine/templates/bpmn/ProcessMapContext.js
@@ -324,7 +324,7 @@ ProcessMapContext.prototype.processPermission= function()
             { name: 'OP_CASE_STATUS',type: 'string'}
         ]);
 
-var PermissionStore = new Ext.data.JsonStore({
+  var PermissionStore = new Ext.data.JsonStore({
             root         : 'data',
             totalProperty: 'totalCount',
             idProperty   : 'gridIndex',
@@ -2111,7 +2111,8 @@ ProcessMapContext.prototype.ExtVariables = function()
                                                    getObjectGridRow.colModel.config[3].editor.setValue(rowLabel);
                                                //Assigning / updating Condition for a row
                                                else
-                                                   getObjectGridRow[0].set(FieldSelected,rowLabel);
+                                                       getObjectGridRow[0].set(FieldSelected,rowLabel);
+
                                                    if(FieldSelected=='CTO_CONDITION')
                                                        {
                                                    Ext.Ajax.request({
@@ -2347,4 +2348,4 @@ ProcessMapContext.prototype.ExtVariables = function()
         items: [varForm]
   });
     window.show();
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/templates/bpmn/SubProcess.js b/workflow/engine/templates/bpmn/SubProcess.js
index 7d85aa621..7baf13202 100755
--- a/workflow/engine/templates/bpmn/SubProcess.js
+++ b/workflow/engine/templates/bpmn/SubProcess.js
@@ -1,6 +1,10 @@
 bpmnSubProcess = function (_30ab) {
     VectorFigure.call(this);
-    this.setDimension(165, 50);
+    //Setting width and height values as per the zoom ratio
+    if(typeof workflow.zoomTaskWidth != 'undefined' || typeof workflow.zoomTaskHeight != 'undefined')
+          this.setDimension(workflow.zoomTaskWidth, workflow.zoomTaskHeight);
+    else
+        this.setDimension(165, 50);
     this.subProcessName = _30ab.subProcessName; //It will set the Default Task Name with appropriate count While dragging a task on the canvas
 };
 
diff --git a/workflow/engine/templates/bpmn/bpmnShapes.js b/workflow/engine/templates/bpmn/bpmnShapes.js
index c7af93066..f33b9b46c 100755
--- a/workflow/engine/templates/bpmn/bpmnShapes.js
+++ b/workflow/engine/templates/bpmn/bpmnShapes.js
@@ -5,10 +5,16 @@ bpmnTask = function (_30ab) {
    {
       this.boundaryEvent = _30ab.boundaryEvent;
    }
+   //Getting width and height from DB
    if(typeof _30ab.task_width != 'undefined' && typeof _30ab.task_height != 'undefined')
         this.setDimension(_30ab.task_width, _30ab.task_height);
-    else
-    this.setDimension(165, 40);
+   else
+        this.setDimension(165, 40);
+
+   //Setting width and height values as per the zoom ratio
+   if(typeof workflow.zoomTaskWidth != 'undefined' || typeof workflow.zoomTaskHeight != 'undefined')
+        this.setDimension(workflow.zoomTaskWidth, workflow.zoomTaskHeight);
+
 
     this.taskName = _30ab.taskName; //It will set the Default Task Name with appropriate count While dragging a task on the canvas
 };
@@ -99,7 +105,14 @@ bpmnTask.prototype.paint = function () {
     }
 
     var rectheight = this.getHeight() - padtop -7;
-    this.bpmnText.setFont('verdana', '11px', Font.PLAIN);
+
+    //Setting text size to zoom font size if Zoomed
+//    if(typeof workflow.zoomTaskTextSize != 'undefined')
+//        var fontSize = workflow.zoomTaskTextSize;
+//    else
+        var fontSize = 11;
+
+    this.bpmnText.setFont('verdana', +fontSize+'px', Font.PLAIN);
     this.bpmnText.drawStringRect(this.taskName, padleft, padtop, this.rectWidth, rectheight, 'center');
     // tempcoord = this.coord_converter(this.getWidth(), this.getHeight(), this.taskName.length);
     //  bpmnText.drawTextString(this.taskName, this.getWidth(), this.getHeight(), tempcoord.temp_x, tempcoord.temp_y);