diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index c85b9a7750..ac44279858 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -354,7 +355,7 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="Service\EditBreakpointScriptWindow.xaml" />
-    <Page Include="Visualizers\Graph\Drawing\PlusToggleButton.xaml" />
+    <Page Include="Visualizers\Graph\Drawing\NodeControlResources.xaml" />
     <Page Include="Visualizers\Graph\Drawing\PositionedGraphNodeControl.xaml" />
     <Page Include="Visualizers\Graph\ObjectGraphControl.xaml" />
     <Page Include="Visualizers\GridVisualizer\GridVisualizerWindow.xaml" />
@@ -423,4 +424,4 @@
   <PropertyGroup>
     <PostBuildEvent>xcopy "$(ProjectDir)Visualizers\Graph\Graphviz\*.*" "$(TargetDir)" /Y</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/NodeControlResources.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/NodeControlResources.xaml
new file mode 100644
index 0000000000..4981b58bce
--- /dev/null
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/NodeControlResources.xaml
@@ -0,0 +1,66 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="clr-namespace:Debugger.AddIn.Visualizers"
+>
+	<local:TooltipVisibilityConverter x:Key="toolVisConverter"></local:TooltipVisibilityConverter>
+	<DataTemplate x:Key="valueColumnTemplate">
+        <TextBlock Text="{Binding Text}" MaxWidth="200">
+            <TextBlock.ToolTip>
+                <ToolTip 
+                        DataContext="{Binding Path=PlacementTarget, RelativeSource={x:Static RelativeSource.Self}}" 
+                        Visibility="{Binding Converter={StaticResource toolVisConverter}, ConverterParameter=2}">
+                    <TextBlock Text="{Binding Text}"></TextBlock>
+                </ToolTip>
+            </TextBlock.ToolTip>
+        </TextBlock>
+    </DataTemplate>
+	
+	<Style TargetType="{x:Type ToggleButton}">
+        <Setter Property="Focusable"
+          Value="False"/>
+        <Setter Property="Width"
+          Value="19"/>
+        <Setter Property="Height"
+          Value="13"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Width="19"
+                Height="13"
+                Background="Transparent">
+                        <Border Width="9"
+                  Height="9"
+                  BorderThickness="1"
+                  BorderBrush="#FF7898B5"
+                  CornerRadius="1"
+                  SnapsToDevicePixels="true">
+                            <Border.Background>
+                                <LinearGradientBrush StartPoint="0,0"
+                                   EndPoint="1,1">
+                                    <LinearGradientBrush.GradientStops>
+                                        <GradientStop Color="White"
+                                Offset=".2"/>
+                                        <GradientStop Color="#FFC0B7A6"
+                                Offset="1"/>
+                                    </LinearGradientBrush.GradientStops>
+                                </LinearGradientBrush>
+                            </Border.Background>
+                            <Path x:Name="ExpandPath"
+                  Margin="1,1,1,1"
+                  Fill="Black"
+                  Data="M 0 2 L 0 3 L 2 3 L 2 5 L 3 5 L 3 3 L 5 3 L 5 2 L 3 2 L 3 0 L 2 0 L 2 2 Z"/>
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked"
+                   Value="True">
+                            <Setter Property="Data"
+                    TargetName="ExpandPath"
+                    Value="M 0 2 L 0 3 L 5 3 L 5 2 Z"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+	</Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PlusToggleButton.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PlusToggleButton.xaml
deleted file mode 100644
index c5838354ca..0000000000
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PlusToggleButton.xaml
+++ /dev/null
@@ -1,52 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
-	<Style TargetType="{x:Type ToggleButton}">
-            <Setter Property="Focusable"
-              Value="False"/>
-            <Setter Property="Width"
-              Value="19"/>
-            <Setter Property="Height"
-              Value="13"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ToggleButton}">
-                        <Border Width="19"
-                    Height="13"
-                    Background="Transparent">
-                            <Border Width="9"
-                      Height="9"
-                      BorderThickness="1"
-                      BorderBrush="#FF7898B5"
-                      CornerRadius="1"
-                      SnapsToDevicePixels="true">
-                                <Border.Background>
-                                    <LinearGradientBrush StartPoint="0,0"
-                                       EndPoint="1,1">
-                                        <LinearGradientBrush.GradientStops>
-                                            <GradientStop Color="White"
-                                    Offset=".2"/>
-                                            <GradientStop Color="#FFC0B7A6"
-                                    Offset="1"/>
-                                        </LinearGradientBrush.GradientStops>
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                                <Path x:Name="ExpandPath"
-                      Margin="1,1,1,1"
-                      Fill="Black"
-                      Data="M 0 2 L 0 3 L 2 3 L 2 5 L 3 5 L 3 3 L 5 3 L 5 2 L 3 2 L 3 0 L 2 0 L 2 2 Z"/>
-                            </Border>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsChecked"
-                       Value="True">
-                                <Setter Property="Data"
-                        TargetName="ExpandPath"
-                        Value="M 0 2 L 0 3 L 5 3 L 5 2 Z"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml
index 6dce2ae41f..d1c22fb132 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml
@@ -7,21 +7,9 @@
 	<UserControl.Resources>
 		<ResourceDictionary>
           <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="PlusToggleButton.xaml" />
+            <ResourceDictionary Source="NodeControlResources.xaml" />
           </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-		<local:TooltipVisibilityConverter x:Key="toolVisConverter"></local:TooltipVisibilityConverter>
-		<DataTemplate x:Key="valueColumnTemplate">
-            <TextBlock Text="{Binding Text}">
-                <TextBlock.ToolTip>
-                    <ToolTip 
-                            DataContext="{Binding Path=PlacementTarget, RelativeSource={x:Static RelativeSource.Self}}" 
-                            Visibility="{Binding Converter={StaticResource toolVisConverter}, ConverterParameter=2}">
-                        <TextBlock Text="{Binding Text}"></TextBlock>
-                    </ToolTip>
-                </TextBlock.ToolTip>
-            </TextBlock>
-        </DataTemplate>
+       </ResourceDictionary>
 	</UserControl.Resources>
 	
     <aero:SystemDropShadowChrome>
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs
index a5dd009e13..70fbd38ec2 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs
@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 using System;
+using System.ComponentModel;
 
 namespace Debugger.AddIn.Visualizers.Graph.Layout
 {
@@ -49,9 +50,8 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 		{
 			get
 			{
-				// show expand button when appropriate
+				// show expand button for non-null non-atomic objects
 				return (!this.positionedProperty.IsAtomic && !this.positionedProperty.IsNull);
-				//return true;
 			}
 		}
 		
@@ -63,7 +63,9 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 			PropertyNode sourcePropertyNode = source as PropertyNode;
 			
 			this.Name = sourcePropertyNode.Property.Name;
-			this.Text = sourcePropertyNode.Property.Value;		// evaluated in Evaluate()
+			// Important to set Text here, as we might be just building new view over existing (evaluated) model.
+			// Evaluated also in Evaluate() if needed.
+			this.Text = sourcePropertyNode.Property.Value;		
 			this.IsNested = false;
 			this.IsExpanded = false;			// always false, property content nodes are never expanded
 			this.positionedProperty = new PositionedNodeProperty(
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/IListNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/IListNode.cs
index 48bccfe32d..82d5450dab 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/IListNode.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/IListNode.cs
@@ -29,6 +29,6 @@ namespace Debugger.AddIn.TreeModel
 		
 		public override bool HasChildNodes {
 			get { return this.count > 0; }
-	}
+		}
 	}
 }
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs
index 8cd2c46ad9..d45d3ab541 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs
@@ -23,7 +23,8 @@ namespace Debugger.AddIn.Visualizers.Utils
 		/// <returns>True if expression's type is atomic, False otherwise.</returns>
 		public static bool IsAtomic(this DebugType type)
 		{
-			return !(type.IsClass || type.IsValueType /* = struct in C# */);
+			// class is complex, String has IsClass == true but we want to treat it like atomic
+			return !type.IsClass || type.FullName == "System.String";
 		}
 		
 		/// <summary>