diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
index 57efda84ec..280a3a81da 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
@@ -474,6 +474,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:InPlaceEditor}">
                     <TextBox Name="editor"
+                             ToolTip="Edit the Text. Press ESC key to make changes."
                              SnapsToDevicePixels="True"
                              Padding="{Binding Path=Padding}"    
                              FontSize="{Binding Path=FontSize}"
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridUnitSelector.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridUnitSelector.xaml
index d3d5f49f50..a689853032 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridUnitSelector.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridUnitSelector.xaml
@@ -1,29 +1,60 @@
-<UserControl x:Class="ICSharpCode.WpfDesign.Designer.Controls.GridUnitSelector"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Name="control" HorizontalContentAlignment="Left" VerticalContentAlignment="Top">
+<?xml version="1.0" encoding="utf-8"?>
+<UserControl
+	x:Class="ICSharpCode.WpfDesign.Designer.Controls.GridUnitSelector" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	x:Name="control"
+	HorizontalContentAlignment="Left"
+	VerticalContentAlignment="Top">
 	<UserControl.Resources>
-		<Style TargetType="RadioButton">
-			<Setter Property="Template">
+		<Style
+			TargetType="RadioButton">
+			<Setter
+				Property="Template">
 				<Setter.Value>
 					<ControlTemplate>
 						<ToggleButton
 							IsChecked="{Binding Path=IsChecked, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
 							Content="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}"
 							Padding="{Binding Path=Padding, RelativeSource={RelativeSource TemplatedParent}}"
-							Name="toggleButton"/>
+							Name="toggleButton" />
 					</ControlTemplate>
 				</Setter.Value>
 			</Setter>
 		</Style>
 	</UserControl.Resources>
-	<Border CornerRadius="3" BorderBrush="CornflowerBlue" Background="LightBlue" BorderThickness="1">
-		<StackPanel Orientation="{Binding Orientation, ElementName=control}">
-			<RadioButton x:Name="fixed" Content="Fixed" Margin="1" FontSize="8" GroupName="group" Checked="FixedChecked" />
-			<RadioButton x:Name="star" Margin="1" FontSize="16" GroupName="group" Checked="StarChecked">
-				<TextBlock Text="*" Margin="3,-4,3,-8"/>
+	<Border
+		CornerRadius="3"
+		BorderBrush="CornflowerBlue"
+		Background="LightBlue"
+		BorderThickness="1">
+		<StackPanel
+			Orientation="{Binding Orientation, ElementName=control}">
+			<RadioButton
+				x:Name="fixed"
+				Content="Fixed"
+				Margin="1"
+				FontSize="8"
+				ToolTip="Fixed - Column size is fixed width"
+				GroupName="group"
+				Checked="FixedChecked" />
+			<RadioButton
+				x:Name="star"
+				Margin="1"
+				FontSize="16"
+				ToolTip="Star - Column size is weighted proportion"
+				GroupName="group"
+				Checked="StarChecked">
+				<TextBlock
+					Text="*"
+					Margin="3,-4,3,-8" />
 			</RadioButton>
-			<RadioButton x:Name="auto" Content="Auto" Margin="1" FontSize="8" GroupName="group" Checked="AutoChecked" />
+			<RadioButton
+				x:Name="auto"
+				Content="Auto"
+				Margin="1"
+				FontSize="8"
+				ToolTip="Auto - Column size is determined by the Content(s)"
+				GroupName="group"
+				Checked="AutoChecked" />
 		</StackPanel>
 	</Border>
 </UserControl>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
index 6c15125e72..85f2f72727 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
@@ -71,6 +71,10 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
+      <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
+      <Name>ICSharpCode.SharpDevelop.Widgets</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj">
       <Project>{88DA149F-21B2-48AB-82C4-28FB6BDFD783}</Project>
       <Name>WpfDesign.XamlDom</Name>