diff --git a/plugin.xml b/plugin.xml
index dfc8153..fe414c1 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -186,7 +186,7 @@
       <specification
             annotationType="org.ntlab.traceDebugger.bottomDeltaAnnotation"
             colorPreferenceKey="clcolor"
-            colorPreferenceValue="255,128,128"
+            colorPreferenceValue="255,178,101"
             highlightPreferenceKey="clhighlight"
             highlightPreferenceValue="true"
             icon="icons/deltaMarker.png"
@@ -204,7 +204,7 @@
       <specification
             annotationType="org.ntlab.traceDebugger.coordinatorDeltaAnnotation"
             colorPreferenceKey="clcolor2"
-            colorPreferenceValue="0,255,0"
+            colorPreferenceValue="255,255,153"
             highlightPreferenceKey="clhighlight2"
             highlightPreferenceValue="true"
             icon="icons/deltaMarker.png"
@@ -222,7 +222,7 @@
       <specification
             annotationType="org.ntlab.traceDebugger.srcSideDeltaAnnotation"
             colorPreferenceKey="clcolor3"
-            colorPreferenceValue="255,128,0"
+            colorPreferenceValue="255,204,216"
             highlightPreferenceKey="clhighlight3"
             highlightPreferenceValue="true"
             icon="icons/deltaMarker.png"
@@ -240,7 +240,7 @@
       <specification
             annotationType="org.ntlab.traceDebugger.dstSideDeltaAnnotation"
             colorPreferenceKey="clcolor4"
-            colorPreferenceValue="0,255,255"
+            colorPreferenceValue="153,255,255"
             highlightPreferenceKey="clhighlight4"
             highlightPreferenceValue="true"
             icon="icons/deltaMarker.png"
diff --git a/src/org/ntlab/traceDebugger/DebuggingController.java b/src/org/ntlab/traceDebugger/DebuggingController.java
index 723e2cf..a43638c 100644
--- a/src/org/ntlab/traceDebugger/DebuggingController.java
+++ b/src/org/ntlab/traceDebugger/DebuggingController.java
@@ -177,9 +177,9 @@
 		TracePoint previousTp = debuggingTp;
 		debuggingTp = debuggingTp.duplicate();
 		debuggingTp.stepFull();
-		if (debuggingTp.getStatement() instanceof BlockEnter) {
-			debuggingTp.stepFull();
-		}
+//		if (debuggingTp.getStatement() instanceof BlockEnter) {
+//			debuggingTp.stepFull();
+//		}
 		if (!debuggingTp.isValid()) {
 			terminateAction();
 			MessageDialog.openInformation(null, "Terminate", "This trace is terminated");
@@ -227,9 +227,9 @@
 			MessageDialog.openInformation(null, "Terminate", "This trace is terminated");
 			return false;
 		}		
-		if (debuggingTp.getStatement() instanceof BlockEnter) {
-			debuggingTp.stepFull();
-		}
+//		if (debuggingTp.getStatement() instanceof BlockEnter) {
+//			debuggingTp.stepFull();
+//		}
 		refresh(previousTp, debuggingTp, isReturned, true);
 		return true;
 	}
@@ -285,9 +285,9 @@
 			MessageDialog.openInformation(null, "Terminate", "This trace is terminated");
 			return false;
 		}		
-		if (debuggingTp.getStatement() instanceof BlockEnter) {
-			debuggingTp.stepFull();
-		}
+//		if (debuggingTp.getStatement() instanceof BlockEnter) {
+//			debuggingTp.stepFull();
+//		}
 		refresh(previousTp, debuggingTp, isReturned, true);
 		return true;	
 	}
diff --git a/src/org/ntlab/traceDebugger/DeltaMarkerLabelProvider.java b/src/org/ntlab/traceDebugger/DeltaMarkerLabelProvider.java
index ea2d204..1f2f32d 100644
--- a/src/org/ntlab/traceDebugger/DeltaMarkerLabelProvider.java
+++ b/src/org/ntlab/traceDebugger/DeltaMarkerLabelProvider.java
@@ -6,14 +6,17 @@
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.ntlab.traceDebugger.analyzerProvider.DeltaMarkerManager;
 
 public class DeltaMarkerLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {
-
+	public static final Color COORDINATOR_LABEL_COLOR = new Color(Display.getDefault(), 255, 255, 153);
+	public static final Color SETTER_SIDE_LABEL_COLOR = new Color(Display.getDefault(), 255, 204, 216);
+	public static final Color GETTER_SIDE_LABEL_COLOR = new Color(Display.getDefault(), 153, 255, 255);
+	public static final Color BOTTOM_LABEL_COLOR = new Color(Display.getDefault(), 255, 178, 101);
+	
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 		if (element instanceof TreeNode) {
@@ -96,13 +99,13 @@
 			if (value instanceof String) {
 				String str = (String)value;
 				if (str.contains("RelatedPoint")) {
-					return new Color(Display.getDefault(), 255, 128, 128);
+					return BOTTOM_LABEL_COLOR;
 				} else if (str.contains("Coordinator")) {
-					return Display.getDefault().getSystemColor(SWT.COLOR_GREEN);
+					return COORDINATOR_LABEL_COLOR;
 				} else if (str.contains("Src")) {
-					return new Color(Display.getDefault(), 255, 128, 0);
+					return SETTER_SIDE_LABEL_COLOR;
 				} else if (str.contains("Dst")) {
-					return Display.getDefault().getSystemColor(SWT.COLOR_CYAN);
+					return GETTER_SIDE_LABEL_COLOR;
 				}
 				return null;
 			}
@@ -111,13 +114,13 @@
 				try {
 					String markerType = marker.getType();
 					if (markerType.equals(DeltaMarkerManager.BOTTOM_DELTA_MARKER)) {
-						return new Color(Display.getDefault(), 255, 128, 128);
+						return BOTTOM_LABEL_COLOR;
 					} else if (markerType.equals(DeltaMarkerManager.COORDINATOR_DELTA_MARKER)) {
-						return Display.getDefault().getSystemColor(SWT.COLOR_GREEN);
+						return COORDINATOR_LABEL_COLOR;
 					} else if (markerType.equals(DeltaMarkerManager.SRC_SIDE_DELTA_MARKER)) {
-						return new Color(Display.getDefault(), 255, 128, 0);			
+						return SETTER_SIDE_LABEL_COLOR;
 					} else if (markerType.equals(DeltaMarkerManager.DST_SIDE_DELTA_MARKER)) {
-						return Display.getDefault().getSystemColor(SWT.COLOR_CYAN);
+						return GETTER_SIDE_LABEL_COLOR;
 					}
 				} catch (CoreException e) {
 					e.printStackTrace();
diff --git a/src/org/ntlab/traceDebugger/DeltaMarkerView.java b/src/org/ntlab/traceDebugger/DeltaMarkerView.java
index ad7d7f7..497f3f8 100644
--- a/src/org/ntlab/traceDebugger/DeltaMarkerView.java
+++ b/src/org/ntlab/traceDebugger/DeltaMarkerView.java
@@ -31,6 +31,7 @@
 	private TreeViewer viewer;
 	private Shell shell;
 	private IMarker selectionMarker;
+	private boolean doNotUpdateCallTreeView;
 	private DeltaMarkerManager deltaMarkerManager;
 	public static String ID = "org.ntlab.traceDebugger.deltaMarkerView";
 
@@ -65,7 +66,8 @@
 				if (!(value instanceof IMarker)) return;
 				selectionMarker = (IMarker)value;
 				updateOtherViewsByMarker(selectionMarker);
-				setFocus();
+				doNotUpdateCallTreeView = true;
+				viewer.getControl().setFocus();
 			}
 		});
 		viewer.refresh();
@@ -97,9 +99,12 @@
 	public void setFocus() {
 		// TODO Auto-generated method stub
 		TraceDebuggerPlugin.setActiveView(ID, this);
-		CallTreeView callTreeView = (CallTreeView)TraceDebuggerPlugin.getActiveView(CallTreeView.ID);
-		callTreeView.update(deltaMarkerManager);
-//		updateOtherViewsByMarker(selectionMarker);
+		if (!doNotUpdateCallTreeView) {
+			CallTreeView callTreeView = (CallTreeView)TraceDebuggerPlugin.getActiveView(CallTreeView.ID);
+			callTreeView.update(deltaMarkerManager);
+//			updateOtherViewsByMarker(selectionMarker);
+		}
+		doNotUpdateCallTreeView = false;
 		viewer.getControl().setFocus();
 	}
 	
@@ -157,8 +162,8 @@
 				controller.jumpToTheTracePoint(jumpPoint, isReturned);
 				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 				IDE.openEditor(page, marker);
-				CallTreeView callTreeView = ((CallTreeView)TraceDebuggerPlugin.getActiveView(CallTreeView.ID));
-				callTreeView.highlight(selectionME);
+//				CallTreeView callTreeView = ((CallTreeView)TraceDebuggerPlugin.getActiveView(CallTreeView.ID));
+//				callTreeView.highlight(selectionME);
 				CallStackView callStackView = (CallStackView)TraceDebuggerPlugin.getActiveView(CallStackView.ID);
 				callStackView.highlight(coordinatorPoint.getMethodExecution());
 				VariableView variableView = (VariableView)TraceDebuggerPlugin.getActiveView(VariableView.ID);
diff --git a/src/org/ntlab/traceDebugger/VariableLabelProvider.java b/src/org/ntlab/traceDebugger/VariableLabelProvider.java
index 8ab29fe..058d92b 100644
--- a/src/org/ntlab/traceDebugger/VariableLabelProvider.java
+++ b/src/org/ntlab/traceDebugger/VariableLabelProvider.java
@@ -4,14 +4,10 @@
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
-import org.ntlab.traceAnalysisPlatform.tracer.trace.MethodExecution;
-import org.ntlab.traceAnalysisPlatform.tracer.trace.Trace;
 import org.ntlab.traceDebugger.analyzerProvider.DeltaMarkerManager;
 
 public class VariableLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {
@@ -23,6 +19,9 @@
 				String name = (String)value;
 				switch (columnIndex) {
 				case 0:
+					if (name.contains("Constructor")) {
+						return name.substring(0, name.indexOf("Constructor"));
+					}
 					return name.substring(0, name.indexOf(":"));
 				case 1:
 					String valueName = name.substring(name.indexOf(":") + 1);
@@ -89,11 +88,11 @@
 				if (!(markerId instanceof String)) return null;
 				switch ((String)markerId) {
 				case DeltaMarkerManager.SRC_SIDE_DELTA_MARKER:
-					return new Color(Display.getDefault(), 255, 128, 0);
+					return DeltaMarkerLabelProvider.SETTER_SIDE_LABEL_COLOR;
 				case DeltaMarkerManager.DST_SIDE_DELTA_MARKER:
-					return Display.getDefault().getSystemColor(SWT.COLOR_CYAN);
+					return DeltaMarkerLabelProvider.GETTER_SIDE_LABEL_COLOR;
 				case DeltaMarkerManager.COORDINATOR_DELTA_MARKER:
-					return Display.getDefault().getSystemColor(SWT.COLOR_GREEN);
+					return DeltaMarkerLabelProvider.COORDINATOR_LABEL_COLOR;
 				}
 			}
 		}
diff --git a/src/org/ntlab/traceDebugger/Variables.java b/src/org/ntlab/traceDebugger/Variables.java
index 88e8b3e..9a60bcf 100644
--- a/src/org/ntlab/traceDebugger/Variables.java
+++ b/src/org/ntlab/traceDebugger/Variables.java
@@ -225,7 +225,7 @@
 				Variable value = new Variable(Variable.VALUE_VARIABLE_NAME, containerClassName, containerObjId, valueClassName, valueObjId, from, isReturned, VariableType.USE_VALUE);
 				specialVariablesOfUseSide.add(container);
 				specialVariablesOfUseSide.add(value);
-				parentNodeNameOfUseSide = "PreviousFieldAccess:" + fa.getFieldName();
+				parentNodeNameOfUseSide = "after field get of:" + fa.getFieldName();
 			} else if (fromStatement instanceof MethodInvocation) {
 				MethodInvocation mi = (MethodInvocation)fromStatement;
 				MethodExecution calledME = mi.getCalledMethodExecution();
@@ -240,9 +240,9 @@
 					specialVariablesOfUseSide.add(receiver);
 					specialVariablesOfUseSide.add(returned);
 					if (calledME.isConstructor()) {
-						parentNodeNameOfUseSide = "ReturnConstructor:" + calledME.getSignature();
+						parentNodeNameOfUseSide = "after invocation of Constructor:" + calledME.getSignature();
 					} else {
-						parentNodeNameOfUseSide = "ReturnMethod:" + calledME.getSignature();	
+						parentNodeNameOfUseSide = "after invocation of:" + calledME.getSignature();	
 					}
 				}
 			}			
@@ -261,7 +261,7 @@
 				Variable value = new Variable(Variable.VALUE_VARIABLE_NAME, containerClassName, containerObjId, valueClassName, valueObjId, to, isReturned, VariableType.DEF_VALUE);
 				specialVariablesDefSide.add(container);
 				specialVariablesDefSide.add(value);
-				parentNodeNameOfDefSide = "NextUpdate:" + fu.getFieldName();
+				parentNodeNameOfDefSide = "before field set of:" + fu.getFieldName();
 			} else if (toStatement instanceof MethodInvocation) {
 				MethodInvocation mi = (MethodInvocation)toStatement;
 				MethodExecution calledME = mi.getCalledMethodExecution();
@@ -277,9 +277,9 @@
 					specialVariablesDefSide.add(receiver);
 					specialVariablesDefSide.add(arg);
 					if (calledME.isConstructor()) {
-						parentNodeNameOfDefSide = "NextConstructor:" + calledME.getSignature();
+						parentNodeNameOfDefSide = "before invocation of Constructor:" + calledME.getSignature();
 					} else {
-						parentNodeNameOfDefSide = "NextMethod:" + calledME.getSignature();	
+						parentNodeNameOfDefSide = "before invocation of:" + calledME.getSignature();	
 					}
 				}
 			} 
diff --git a/src/org/ntlab/traceDebugger/analyzerProvider/DeltaMarkerManager.java b/src/org/ntlab/traceDebugger/analyzerProvider/DeltaMarkerManager.java
index c84806e..bca857b 100644
--- a/src/org/ntlab/traceDebugger/analyzerProvider/DeltaMarkerManager.java
+++ b/src/org/ntlab/traceDebugger/analyzerProvider/DeltaMarkerManager.java
@@ -72,33 +72,31 @@
 	
 	public TreeNode[] getMarkerTreeNodes() {
 		TreeNode[] roots = new TreeNode[] {
-				new TreeNode("Coordinator"),
+				new TreeNode(""),
 				new TreeNode("Related Aliases"),
-				new TreeNode("Related Point")
+				new TreeNode("")
 		};
-		List<TreeNode> treeNodeList = new ArrayList<>();
-		for (IMarker marker : markersByOrder) {
-			try {
-				TreeNode node = new TreeNode(marker);
-				String markerType = marker.getType();
-				switch (markerType) {
-				case COORDINATOR_DELTA_MARKER:
-					roots[0] = node;
-					break;
-				case SRC_SIDE_DELTA_MARKER:
-				case DST_SIDE_DELTA_MARKER:
-					node.setParent(roots[1]);
-					treeNodeList.add(node);
-					break;
-				case BOTTOM_DELTA_MARKER:
-					roots[2] = node;
-					break;
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
+		List<IMarker> markers;
+		markers = markerIdToMarkers.get(COORDINATOR_DELTA_MARKER);
+		roots[0] = new TreeNode(markers.get(0));
+		List<IMarker> dstSideMarkers = markerIdToMarkers.get(DST_SIDE_DELTA_MARKER);
+		List<IMarker> srcSideMarkers = markerIdToMarkers.get(SRC_SIDE_DELTA_MARKER);
+		int dstSideMarkersSize = (dstSideMarkers != null) ? dstSideMarkers.size() : 0;
+		int srcSideMarkersSize = (srcSideMarkers != null) ? srcSideMarkers.size() : 0;
+		TreeNode[] children = new TreeNode[dstSideMarkersSize + srcSideMarkersSize];
+		if (dstSideMarkers != null) {
+			for (int i = 0; i < dstSideMarkers.size(); i++) {
+				children[i] = new TreeNode(dstSideMarkers.get(i));
 			}
 		}
-		roots[1].setChildren(treeNodeList.toArray(new TreeNode[treeNodeList.size()]));
+		if (srcSideMarkers != null) {
+			for (int i = 0; i < srcSideMarkers.size(); i++) {
+				children[dstSideMarkersSize + i] = new TreeNode(srcSideMarkers.get(i));
+			}
+		}
+		roots[1].setChildren(children);
+		markers = markerIdToMarkers.get(BOTTOM_DELTA_MARKER);
+		roots[2] = new TreeNode(markers.get(0));		
 		return roots;
 	}
 	
@@ -149,21 +147,21 @@
 	}
 
 	public void createMarkerAndOpenJavaFileForAll() {
-		int srcSideCnt = 1;
-		int dstSideCnt = 1;
 		markAndOpenJavaFileForCoordinator(coordinator, "Coordinator", DeltaMarkerManager.COORDINATOR_DELTA_MARKER);
-		List<Alias> relatedAliases = aliasCollector.getRelatedAliases();
-		Collections.reverse(relatedAliases);
-		for (Alias alias : relatedAliases) {
-			String side = aliasCollector.resolveSideInTheDelta(alias);
-			if (side.contains(DeltaRelatedAliasCollector.SRC_SIDE)) {
-				String message = String.format("SrcSide%03d", srcSideCnt);
-				markAndOpenJavaFileForAlias(alias, message, DeltaMarkerManager.SRC_SIDE_DELTA_MARKER);
-				srcSideCnt++;
-			} else if (side.contains(DeltaRelatedAliasCollector.DST_SIDE)) {
-				String message = String.format("DstSide%03d", dstSideCnt);
-				markAndOpenJavaFileForAlias(alias, message, DeltaMarkerManager.DST_SIDE_DELTA_MARKER);
-				dstSideCnt++;		
+		List<Alias> dstSideAliases = new ArrayList<>(aliasCollector.getDstSideRelatedAliases());
+		List<Alias> srcSideAliases = new ArrayList<>(aliasCollector.getSrcSideRelatedAliases());
+		List<List<Alias>> relatedAliasesList = new ArrayList<>();
+		relatedAliasesList.add(dstSideAliases);
+		relatedAliasesList.add(srcSideAliases);
+		String[] messagesTemplates = {"GetterSide%03d", "SetterSide%03d"};
+		String[] markerIDList = {DST_SIDE_DELTA_MARKER, SRC_SIDE_DELTA_MARKER};
+		for (int i = 0; i < relatedAliasesList.size(); i++) {
+			List<Alias> relatedAliases = relatedAliasesList.get(i);
+			Collections.reverse(relatedAliases);
+			int cnt = 1;
+			for (Alias alias : relatedAliases) {
+				String message = String.format(messagesTemplates[i], cnt++);
+				markAndOpenJavaFileForAlias(alias, message, markerIDList[i]);
 			}
 		}
 		markAndOpenJavaFileForCreationPoint(relatedPoint, relatedPointReference, "RelatedPoint", DeltaMarkerManager.BOTTOM_DELTA_MARKER);
diff --git a/src/org/ntlab/traceDebugger/analyzerProvider/DeltaRelatedAliasCollector.java b/src/org/ntlab/traceDebugger/analyzerProvider/DeltaRelatedAliasCollector.java
index 6ab3400..d9be4d4 100644
--- a/src/org/ntlab/traceDebugger/analyzerProvider/DeltaRelatedAliasCollector.java
+++ b/src/org/ntlab/traceDebugger/analyzerProvider/DeltaRelatedAliasCollector.java
@@ -79,6 +79,14 @@
 		return relatedAliases;
 	}
 	
+	public List<Alias> getSrcSideRelatedAliases() {
+		return srcSideRelatedAliases;
+	}
+	
+	public List<Alias> getDstSideRelatedAliases() {
+		return dstSideRelatedAliases;
+	}
+		
 	public String resolveSideInTheDelta(Alias alias) {
 		int index;
 		index = srcSideRelatedAliases.indexOf(alias);