diff --git a/Snoop/MethodsTab/MethodsControl.xaml b/Snoop/MethodsTab/MethodsControl.xaml
index 2f198b993..53913afa9 100644
--- a/Snoop/MethodsTab/MethodsControl.xaml
+++ b/Snoop/MethodsTab/MethodsControl.xaml
@@ -4,133 +4,268 @@ This source is subject to the Microsoft Public License (Ms-PL).
 Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 All other rights reserved.
 -->
-<UserControl x:Class="Snoop.MethodsTab.MethodsControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Snoop.MethodsTab"
-             xmlns:snoopNS="clr-namespace:Snoop"
-             xmlns:converters="clr-namespace:Snoop.Converters" 
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="420">
-    <UserControl.Resources>
-
-        <local:SnoopParameterInformationTemplateSelector x:Key="SnoopParameterInformationTemplateSelector" />
-
-        <DataTemplate x:Key="EnumParameterTemplate">
-            <Grid  Margin="0,0,0,10">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="{Binding Path=ParameterName}" Margin="0,0,25,0" HorizontalAlignment="Left" />
-                <ComboBox ItemsSource="{Binding Path=ParameterValue, Converter={x:Static converters:SnoopEnumValuesConverter.Default}}"
-                          SelectedValue="{Binding Path=ParameterValue}" Grid.Column="1" Width="129" HorizontalAlignment="Left" />
-                <!--<TextBox Name="ParameterValue" Width="100" Text="{Binding Path=ParameterValue, Mode=OneWayToSource}" Grid.Column="1" HorizontalAlignment="Left" />-->
-            </Grid>
-        </DataTemplate>
-
-        <DataTemplate x:Key="DependencyPropertyTemplate">
-            <Grid  Margin="0,0,0,10">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="{Binding Path=ParameterName}" Margin="0,0,25,0" HorizontalAlignment="Left" />
-                <ComboBox ItemsSource="{Binding Converter={x:Static converters:SnoopDependencyPropertiesConverter.Default}}" 
-                          Grid.Column="1" Width="129" HorizontalAlignment="Left" SelectedValue="{Binding Path=ParameterValue, Mode=TwoWay}" />
-                <!--<TextBox Name="ParameterValue" Width="100" Text="{Binding Path=ParameterValue, Mode=OneWayToSource}" Grid.Column="1" HorizontalAlignment="Left" />-->
-            </Grid>
-        </DataTemplate>
-
-        <DataTemplate x:Key="DefaultParameterTemplate">
-            <Grid  Margin="0,0,0,10">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="{Binding Path=ParameterName}" Margin="0,0,25,0" HorizontalAlignment="Left" />
-                <TextBox Name="ParameterValue" Width="100" Text="{Binding Path=ParameterValue, Mode=OneWayToSource}" Grid.Column="1" HorizontalAlignment="Left" />
-            </Grid>
-        </DataTemplate>
-
-        <DataTemplate x:Key="UnknownParameterTemplate">
-            <Grid Margin="0,0,0,10">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="160" />
-                    <ColumnDefinition Width="160" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="{Binding Path=ParameterName}" Margin="0,0,25,0" HorizontalAlignment="Left" />
-                <!--<Rectangle Width="1" Fill="Black" HorizontalAlignment="Right" />-->
-                <Button HorizontalAlignment="Left" Width="150" Height="25" Content="Create/Modify Parameter"  Command="{Binding Path=CreateCustomParameterCommand}" Grid.Column="1" />
-                <Button HorizontalAlignment="Left" Width="150" Height="25" Content="Clear Parameter"  Command="{Binding Path=NullOutParameterCommand}" Grid.Column="2" />
-                <TextBlock Text="{Binding Path=ParameterValue}" Grid.Column="3" VerticalAlignment="Center" />
-            </Grid>
-        </DataTemplate>
-    </UserControl.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="45" />
-            <RowDefinition Height="25" />
-            <RowDefinition Height="50" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        
-        <StackPanel Orientation="Horizontal" Grid.Row="0">
-            <Button Height="30" Width="100" Content="Change Target" Click="ChangeTarget_Click" Margin="0,0,15,0" />
-            
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <TextBlock Text="Current Target: " VerticalAlignment="Center" FontWeight="Bold" />
-                <TextBlock Grid.Row="1" Text="{Binding Path=Target, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MethodsControl}}}" VerticalAlignment="Center" />                
-            </Grid>
-        </StackPanel>
-
-        <CheckBox Name="_checkBoxUseDataContext" Content="Use DataContext property" Grid.Row="1" />
-
-        <StackPanel Orientation="Horizontal" Grid.Row="2">
-            <TextBlock Text="Method: "  VerticalAlignment="Center" FontWeight="Bold"/>
-            <ComboBox Name="comboBoxMethods" Height="25" Width="350" />
-        </StackPanel>
-
-        <StackPanel Grid.Row="3" Margin="0,10,0,10" Name="parametersContainer" Visibility="Collapsed">
-            <TextBlock Text="Parameters:" Foreground="Black" Margin="0,0,0,10" FontWeight="Bold" />
-            <ItemsControl Name="itemsControlParameters" Grid.Row="1" Margin="0,10,0,0" ItemTemplateSelector="{StaticResource SnoopParameterInformationTemplateSelector}" />
-        </StackPanel>        
-        
-        <Button Grid.Row="4"
-                Height="25"
-                Width="200"
-                Content="Invoke"
-                HorizontalAlignment="Left"
-                Click="InvokeMethodClick" />
-        
-        <StackPanel Name="resultStringContainer" Grid.Row="5" Margin="0,20,0,0" Orientation="Horizontal" Visibility="Collapsed">
-            <TextBlock Name="textBlockResultLabel" Text="Result as string: " Foreground="Black" FontWeight="Bold" />
-            <TextBox IsReadOnly="True" Name="textBlockResult" Grid.Row="3" />
-        </StackPanel>
-
-        <Grid Grid.Row="6" Margin="0,25,0,0" Name="resultProperties" Visibility="Collapsed">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <TextBlock Text="Result Properties:" Foreground="Black" FontWeight="Bold" />
-            <snoopNS:PropertyInspector x:Name="propertyInspector" Grid.Row="1"  />
-        </Grid>
-
-        
-        
-    </Grid>
+<UserControl
+	x:Class="Snoop.MethodsTab.MethodsControl"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="clr-namespace:Snoop.MethodsTab"
+	xmlns:snoopNS="clr-namespace:Snoop"
+	xmlns:converters="clr-namespace:Snoop.Converters"
+	mc:Ignorable="d"
+	d:DesignWidth="420"
+	d:DesignHeight="300"
+>
+	<UserControl.Resources>
+		<local:SnoopParameterInformationTemplateSelector x:Key="SnoopParameterInformationTemplateSelector"/>
+
+		<DataTemplate x:Key="EnumParameterTemplate">
+			<Grid Margin="0,0,0,10">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto"/>
+					<ColumnDefinition/>
+				</Grid.ColumnDefinitions>
+
+				<TextBlock
+					Style="{x:Null}"
+					HorizontalAlignment="Left"
+					Margin="0,0,25,0"
+					Text="{Binding ParameterName}"
+				/>
+				<ComboBox
+					Grid.Column="1"
+					Width="129"
+					HorizontalAlignment="Left"
+					ItemsSource="{Binding ParameterValue, Converter={x:Static converters:SnoopEnumValuesConverter.Default}}"
+					SelectedValue="{Binding ParameterValue}"
+				/>
+			</Grid>
+		</DataTemplate>
+
+		<DataTemplate x:Key="DependencyPropertyTemplate">
+			<Grid Margin="0,0,0,10">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto"/>
+					<ColumnDefinition/>
+				</Grid.ColumnDefinitions>
+
+				<TextBlock
+					Style="{x:Null}"
+					HorizontalAlignment="Left"
+					Margin="0,0,25,0"
+					Text="{Binding ParameterName}"
+				/>
+				<ComboBox
+					Grid.Column="1"
+					Width="129"
+					HorizontalAlignment="Left"
+					ItemsSource="{Binding Converter={x:Static converters:SnoopDependencyPropertiesConverter.Default}}"
+					SelectedValue="{Binding ParameterValue, Mode=TwoWay}"
+				/>
+			</Grid>
+		</DataTemplate>
+
+		<DataTemplate x:Key="DefaultParameterTemplate">
+			<Grid Margin="0,0,0,10">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto"/>
+					<ColumnDefinition/>
+				</Grid.ColumnDefinitions>
+
+				<TextBlock
+					Style="{x:Null}"
+					HorizontalAlignment="Left"
+					Margin="0,0,25,0"
+					Text="{Binding ParameterName}"
+				/>
+				<TextBox
+					x:Name="ParameterValue"
+					Style="{x:Null}"
+					Grid.Column="1"
+					Width="100"
+					HorizontalAlignment="Left"
+					Text="{Binding ParameterValue, Mode=OneWayToSource}"
+				/>
+			</Grid>
+		</DataTemplate>
+
+		<DataTemplate x:Key="UnknownParameterTemplate">
+			<Grid Margin="0,0,0,10">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto"/>
+					<ColumnDefinition Width="160"/>
+					<ColumnDefinition Width="160"/>
+					<ColumnDefinition Width="*"/>
+				</Grid.ColumnDefinitions>
+
+				<TextBlock
+					Style="{x:Null}"
+					HorizontalAlignment="Left"
+					Margin="0,0,25,0"
+					Text="{Binding ParameterName}"
+				/>
+				<Button
+					Grid.Column="1"
+					Width="150"
+					Height="25"
+					HorizontalAlignment="Left"
+					Command="{Binding CreateCustomParameterCommand}"
+				>
+					<TextBlock Style="{x:Null}" Text="Create/Modify Parameter"/>
+				</Button>
+				<Button
+					Grid.Column="2"
+					Width="150"
+					Height="25"
+					HorizontalAlignment="Left"
+					Command="{Binding NullOutParameterCommand}"
+				>
+					<TextBlock Style="{x:Null}" Text="Clear Parameter"/>
+				</Button>
+				<TextBlock
+					Style="{x:Null}"
+					Grid.Column="3"
+					VerticalAlignment="Center"
+					Text="{Binding ParameterValue}"
+				/>
+			</Grid>
+		</DataTemplate>
+	</UserControl.Resources>
+
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="45"/>
+			<RowDefinition Height="25"/>
+			<RowDefinition Height="50"/>
+			<RowDefinition Height="Auto"/>
+			<RowDefinition Height="Auto"/>
+			<RowDefinition Height="Auto"/>
+			<RowDefinition Height="*"/>
+		</Grid.RowDefinitions>
+
+		<StackPanel Orientation="Horizontal" Grid.Row="0">
+			<Button
+				Height="30"
+				Width="100"
+				VerticalAlignment="Center"
+				Margin="0,0,15,0"
+				Click="ChangeTarget_Click"
+			>
+				<TextBlock Style="{x:Null}" Text="Change Target"/>
+			</Button>
+
+			<Grid VerticalAlignment="Center">
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto"/>
+					<RowDefinition Height="Auto"/>
+				</Grid.RowDefinitions>
+
+				<TextBlock
+					Style="{x:Null}"
+					Grid.Row="0"
+					VerticalAlignment="Center"
+					FontWeight="Bold"
+					Text="Current Target:"
+				/>
+				<TextBlock
+					Style="{x:Null}"
+					Grid.Row="1"
+					VerticalAlignment="Center"
+					Text="{Binding Path=Target, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MethodsControl}}}"
+				/>
+			</Grid>
+		</StackPanel>
+
+		<CheckBox
+			x:Name="_checkBoxUseDataContext"
+			Grid.Row="1"
+		>
+			<TextBlock Style="{x:Null}" Text="Use DataContext Property"/>
+		</CheckBox>
+
+		<StackPanel Grid.Row="2" Orientation="Horizontal">
+			<TextBlock
+				Style="{x:Null}"
+				VerticalAlignment="Center"
+				Margin="0,0,5,0"
+				FontWeight="Bold"
+				Text="Method:"
+			/>
+			<ComboBox x:Name="comboBoxMethods" Width="350" Height="25"/>
+		</StackPanel>
+
+		<StackPanel
+			x:Name="parametersContainer"
+			Grid.Row="3"
+			Margin="0,10,0,10"
+			Visibility="Collapsed"
+		>
+			<TextBlock
+				Style="{x:Null}"
+				Margin="0,0,0,10"
+				FontWeight="Bold"
+				Text="Parameters:"
+			/>
+			<ItemsControl
+				x:Name="itemsControlParameters"
+				Grid.Row="1"
+				Margin="0,10,0,0"
+				ItemTemplateSelector="{StaticResource SnoopParameterInformationTemplateSelector}"
+			/>
+		</StackPanel>
+
+		<Button
+			Grid.Row="4"
+			Width="200"
+			Height="25"
+			HorizontalAlignment="Left"
+			Click="InvokeMethodClick"
+		>
+			<TextBlock Style="{x:Null}" Text="Invoke"/>
+		</Button>
+
+		<StackPanel
+			x:Name="resultStringContainer"
+			Grid.Row="5"
+			Margin="0,20,0,0"
+			Orientation="Horizontal"
+			Visibility="Collapsed"
+		>
+			<TextBlock
+				x:Name="textBlockResultLabel"
+				Style="{x:Null}"
+				VerticalAlignment="Center"
+				Margin="0,0,5,0"
+				FontWeight="Bold"
+				Text="Result as string:"
+			/>
+			<TextBox
+				x:Name="textBlockResult"
+				Style="{x:Null}"
+				Grid.Row="3"
+				VerticalAlignment="Center"
+				IsReadOnly="True"
+			/>
+		</StackPanel>
+
+		<Grid
+			x:Name="resultProperties"
+			Grid.Row="6"
+			Margin="0,25,0,0"
+			Visibility="Collapsed"
+		>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto"/>
+				<RowDefinition Height="*"/>
+			</Grid.RowDefinitions>
+
+			<TextBlock
+				Style="{x:Null}"
+				FontWeight="Bold"
+				Text="Result Properties:"
+			/>
+			<snoopNS:PropertyInspector x:Name="propertyInspector" Grid.Row="1"/>
+		</Grid>
+	</Grid>
 </UserControl>
diff --git a/Snoop/Shell/EmbeddedShellView.xaml b/Snoop/Shell/EmbeddedShellView.xaml
index 5442e1f8a..c6b395162 100644
--- a/Snoop/Shell/EmbeddedShellView.xaml
+++ b/Snoop/Shell/EmbeddedShellView.xaml
@@ -1,26 +1,57 @@
-<UserControl x:Class="Snoop.Shell.EmbeddedShellView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-    <UserControl.Resources>
-        <Style TargetType="TextBox">
-            <Setter Property="FontFamily" Value="Consolas" />
-        </Style>
-    </UserControl.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        <StackPanel HorizontalAlignment="Right">
-            <CheckBox x:Name="autoExpandCheckBox" Content="Auto-expand" 
-                      ToolTip="Automatically expands the selected tree item when changed from the PowerShell provider." />
-        </StackPanel>
-        <TextBox x:Name="commandTextBox" Grid.Row="2" />
-        <TextBox x:Name="outputTextBox" Grid.Row="1" AcceptsReturn="True" ScrollViewer.VerticalScrollBarVisibility="Auto" TextWrapping="Wrap" />
-    </Grid>
+<UserControl
+	x:Class="Snoop.Shell.EmbeddedShellView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	mc:Ignorable="d"
+	d:DesignHeight="300"
+	d:DesignWidth="300"
+>
+	<UserControl.Resources>
+		<Style TargetType="TextBox">
+			<Setter Property="FontFamily" Value="Consolas"/>
+		</Style>
+	</UserControl.Resources>
+
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto"/>
+			<RowDefinition Height="*"/>
+			<RowDefinition Height="Auto"/>
+		</Grid.RowDefinitions>
+
+		<StackPanel HorizontalAlignment="Right">
+			<CheckBox
+				x:Name="autoExpandCheckBox"
+			>
+				<TextBlock Text="Auto-expand"/>
+				<CheckBox.ToolTip>
+					<TextBlock
+						MaxWidth="300"
+						Text="Automatically expands the selected tree item when changed from the PowerShell provider."
+						TextWrapping="Wrap"
+					/>
+				</CheckBox.ToolTip>
+			</CheckBox>
+		</StackPanel>
+		<TextBox
+			x:Name="outputTextBox"
+			Grid.Row="1"
+			AcceptsReturn="True"
+			ScrollViewer.VerticalScrollBarVisibility="Auto"
+			TextWrapping="Wrap"
+		/>
+		<TextBox
+			x:Name="commandTextBox"
+			Grid.Row="2"
+		>
+			<TextBox.ToolTip>
+				<StackPanel MaxWidth="300">
+					<TextBlock Text="F5 - Reload Profile"/>
+					<TextBlock Text="F12 - Clear Output"/>
+				</StackPanel>
+			</TextBox.ToolTip>
+		</TextBox>
+	</Grid>
 </UserControl>
diff --git a/Snoop/Shell/EmbeddedShellView.xaml.cs b/Snoop/Shell/EmbeddedShellView.xaml.cs
index 4f1467f8d..a8f8eb35f 100644
--- a/Snoop/Shell/EmbeddedShellView.xaml.cs
+++ b/Snoop/Shell/EmbeddedShellView.xaml.cs
@@ -30,10 +30,6 @@ public EmbeddedShellView()
             InitializeComponent();
 
             this.commandTextBox.PreviewKeyDown += OnCommandTextBoxPreviewKeyDown;
-            ToolTipService.SetToolTip(this.commandTextBox, @"
-F5 - Reload profile
-F12 - Clear output
-");
 
             // ignore execution-policy
             var iis = InitialSessionState.CreateDefault();
diff --git a/Snoop/SnoopUI.xaml b/Snoop/SnoopUI.xaml
index 539672266..0a1fb5ef5 100644
--- a/Snoop/SnoopUI.xaml
+++ b/Snoop/SnoopUI.xaml
@@ -123,7 +123,7 @@ All other rights reserved.
 			x:Name="filterComboBox"
 			i:ComboBoxSettings.IsSnoopPart="True"
 			IsEditable="True"
-			Text="{Binding Path=Filter, UpdateSourceTrigger=PropertyChanged}"
+			Text="{Binding Filter, UpdateSourceTrigger=PropertyChanged}"
 			Margin="2,2,22,2"
 		>
 			<ComboBoxItem>
@@ -244,55 +244,95 @@ All other rights reserved.
 				<TabItem.Header>
 					<TextBlock Style="{x:Null}" Text="Properties">
 						<TextBlock.ToolTip>
-							<StackPanel>
+							<StackPanel MaxWidth="300">
 								<TextBlock Style="{x:Null}" Text="Properties View"/>
-								<TextBlock Style="{x:Null}" Text="Lists all the properties on currently selected object."/>
-								<TextBlock Style="{x:Null}" Text="You can even edit these properties or right-click and"/>
-								<TextBlock Style="{x:Null}" Text="then delve into them."/>
+								<TextBlock
+									Style="{x:Null}"
+									Text="Lists all the properties on currently selected object. You can even edit these properties or right-click and then delve into them."
+									TextWrapping="Wrap"
+								/>
 							</StackPanel>
 						</TextBlock.ToolTip>
 					</TextBlock>
 				</TabItem.Header>
-				<local:PropertyInspector x:Name="PropertyGrid" RootTarget="{Binding Path=CurrentSelection.Target}"/>
+				<local:PropertyInspector x:Name="PropertyGrid" RootTarget="{Binding CurrentSelection.Target}"/>
 			</TabItem>
 			<TabItem>
 				<TabItem.Header>
 					<TextBlock Style="{x:Null}" Text="Data Context">
 						<TextBlock.ToolTip>
-							<StackPanel>
+							<StackPanel MaxWidth="300">
 								<TextBlock Style="{x:Null}" Text="Data Context View"/>
-								<TextBlock Style="{x:Null}" Text="Lists all the properties for the Data Context of the"/>
-								<TextBlock Style="{x:Null}" Text="currently selected object. You can even edit these"/>
-								<TextBlock Style="{x:Null}" Text="properties or right-click and then delve into them."/>
+								<TextBlock
+									Style="{x:Null}"
+									Text="Lists all the properties for the Data Context of the currently selected object. You can even edit these properties or right-click and then delve into them."
+									TextWrapping="Wrap"
+								/>
 							</StackPanel>
 						</TextBlock.ToolTip>
 					</TextBlock>
 				</TabItem.Header>
-				<local:PropertyInspector x:Name="DataContextPropertyGrid" RootTarget="{Binding Path=CurrentSelection.Target.DataContext}"/>
+				<local:PropertyInspector x:Name="DataContextPropertyGrid" RootTarget="{Binding CurrentSelection.Target.DataContext}"/>
 			</TabItem>
 			<TabItem>
 				<TabItem.Header>
 					<TextBlock Style="{x:Null}" Text="Events">
 						<TextBlock.ToolTip>
-							<StackPanel>
+							<StackPanel MaxWidth="300">
 								<TextBlock Style="{x:Null}" Text="Events View"/>
-								<TextBlock Style="{x:Null}" Text="Lists all the all routed events in the application, so you"/>
-								<TextBlock Style="{x:Null}" Text="can see how they route, and where and/or whether they are handled."/>
+								<TextBlock
+									Style="{x:Null}"
+									Text="Lists all the all routed events in the application, so you can see how they route, and where and/or whether they are handled."
+									TextWrapping="Wrap"
+								/>
 							</StackPanel>
 						</TextBlock.ToolTip>
 					</TextBlock>
 				</TabItem.Header>
 				<local:EventsView />
 			</TabItem>
-            
-            <TabItem>
-                <TabItem.Header>
-                    <TextBlock Text="Methods" />
-                </TabItem.Header>
 
-                <MethodsTabNS:MethodsControl RootTarget="{Binding Path=CurrentSelection.Target}" IsSelected="{Binding Path=IsSelected, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}" />
-            </TabItem>
-            <TabItem x:Name="PowerShellTab" Header="PowerShell" Visibility="{Binding Converter={StaticResource isPowerShellInstalled}}" />
+			<TabItem>
+				<TabItem.Header>
+					<TextBlock Style="{x:Null}" Text="Methods">
+						<TextBlock.ToolTip>
+							<StackPanel MaxWidth="300">
+								<TextBlock Style="{x:Null}" Text="Methods View"/>
+								<TextBlock
+									Style="{x:Null}"
+									Text="A rudimentary view that lets you call methods on the selected visual or the data context of the selected visual."
+									TextWrapping="Wrap"
+								/>
+							</StackPanel>
+						</TextBlock.ToolTip>
+					</TextBlock>
+				</TabItem.Header>
+
+				<MethodsTabNS:MethodsControl
+					RootTarget="{Binding CurrentSelection.Target}"
+					IsSelected="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}"
+				/>
+			</TabItem>
+
+			<TabItem
+				x:Name="PowerShellTab"
+				Visibility="{Binding Converter={StaticResource isPowerShellInstalled}}"
+			>
+				<TabItem.Header>
+					<TextBlock Style="{x:Null}" Text="PowerShell">
+						<TextBlock.ToolTip>
+							<StackPanel MaxWidth="300">
+								<TextBlock Style="{x:Null}" Text="PowerShell View"/>
+								<TextBlock
+									Style="{x:Null}"
+									Text="A view which lets you script the Snooped app using PowerShell."
+									TextWrapping="Wrap"
+								/>
+							</StackPanel>
+						</TextBlock.ToolTip>
+					</TextBlock>
+				</TabItem.Header>
+			</TabItem>
 		</TabControl>
 
 		<!-- Horizontal GridSplitter (between the tab control (with the property grid/events view) and the previewer) -->