diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
index ff1be4ba..a6d4a614 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
@@ -2,13 +2,8 @@
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                      xmlns:infConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters;assembly=WPFToolkit.Extended"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
-                      Title="DropDownButton" >
-    <infControls:DemoView.Resources>
-        <infConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    </infControls:DemoView.Resources>
-    
+                      Title="DropDownButton" >    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs
index bf2f25ad..5e2e5e09 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs
@@ -4,6 +4,7 @@ using Microsoft.Practices.Prism.Regions;
 using Microsoft.Practices.Unity;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.Calculator.Views;
+using Samples.Modules.Calculator.NavigationItems;
 
 namespace Samples.Modules.Calculator
 {
@@ -14,12 +15,12 @@ namespace Samples.Modules.Calculator
 
         protected override void InitializeModule()
         {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
+            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(CalculatorNavItem));
+            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(CalculatorUpDownNavItem));
         }
 
         protected override void RegisterViewsAndTypes()
         {
-            Container.RegisterNavigationType(typeof(HomeView));
             Container.RegisterNavigationType(typeof(CalculatorView));
             Container.RegisterNavigationType(typeof(CalculatorUpDownView));
         }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml
new file mode 100644
index 00000000..69027b32
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml
@@ -0,0 +1,12 @@
+<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorNavItem"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
+              Header="Calculator" Tag="{x:Type views:CalculatorView}" >
+
+    <TreeViewItem.Resources>
+        <Style TargetType="navItems:CalculatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+    </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml.cs
new file mode 100644
index 00000000..06ed77eb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Windows.Controls;
+
+namespace Samples.Modules.Calculator.NavigationItems
+{
+    /// <summary>
+    /// Interaction logic for CalculatorNavItem.xaml
+    /// </summary>
+    public partial class CalculatorNavItem : TreeViewItem
+    {
+        public CalculatorNavItem()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml
new file mode 100644
index 00000000..84ebafe4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml
@@ -0,0 +1,12 @@
+<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorUpDownNavItem"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
+              Header="CalculatorUpDown" Tag="{x:Type views:CalculatorUpDownView}" >
+
+    <TreeViewItem.Resources>
+        <Style TargetType="navItems:CalculatorUpDownNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+    </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
new file mode 100644
index 00000000..809329ea
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Windows.Controls;
+
+namespace Samples.Modules.Calculator.NavigationItems
+{
+    /// <summary>
+    /// Interaction logic for CalculatorUpDownNavItem.xaml
+    /// </summary>
+    public partial class CalculatorUpDownNavItem : TreeViewItem
+    {
+        public CalculatorUpDownNavItem()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj
index f2691e96..e15df91c 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj
@@ -62,11 +62,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CalculatorModule.cs" />
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
+    <Compile Include="NavigationItems\CalculatorNavItem.xaml.cs">
+      <DependentUpon>CalculatorNavItem.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
+    <Compile Include="NavigationItems\CalculatorUpDownNavItem.xaml.cs">
+      <DependentUpon>CalculatorUpDownNavItem.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
@@ -108,13 +108,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
+    <Page Include="NavigationItems\CalculatorNavItem.xaml">
       <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
       <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NavigationItems\CalculatorUpDownNavItem.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\CalculatorUpDownView.xaml">
       <SubType>Designer</SubType>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml
index 10f62537..17d27ad8 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml
@@ -2,8 +2,61 @@
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                      xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="CalculatorUpDown">
     <Grid>
-        <TextBlock Text="CalculatorUpDown view" />
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <TextBlock Text="The CalculatorUpDown provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel. It also provides a Calculator dropdown which allows you to perform mathematical calculations."
+                   TextWrapping="Wrap" />
+
+        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
+            <Grid Margin="5" HorizontalAlignment="Left">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="Precision: " VerticalAlignment="Center"  />
+                <extToolkit:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+                <TextBlock Text="FormatString:" Grid.Row="1" VerticalAlignment="Center"/>
+                <ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Row="1" Grid.Column="1" Width="150" Margin="5">
+                    <ComboBoxItem Tag="C2">Currency</ComboBoxItem>
+                    <ComboBoxItem Tag="F2">Fixed Point</ComboBoxItem>
+                    <ComboBoxItem Tag="G">General</ComboBoxItem>
+                    <ComboBoxItem Tag="N">Number</ComboBoxItem>
+                    <ComboBoxItem Tag="P2">Percent</ComboBoxItem>
+                </ComboBox>
+                <TextBlock Text="Watermakr:" Grid.Row="2" VerticalAlignment="Center"/>
+                <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" Text="Enter Value"/>                
+                <TextBlock Grid.Column="2" Text="Increment" VerticalAlignment="Center" />
+                <TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum" VerticalAlignment="Center" />
+                <TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum" VerticalAlignment="Center" />
+                <extToolkit:IntegerUpDown Grid.Column="3" Name="_increment" Minimum="0" Value="1" VerticalAlignment="Center" Margin="5" Width="150" />
+                <extToolkit:IntegerUpDown Grid.Column="3" Grid.Row="1" Name="_minimum" Value="-100" VerticalAlignment="Center" Margin="5" Width="150" />
+                <extToolkit:IntegerUpDown Grid.Column="3" Grid.Row="2" Name="_maximum" Value="5000" VerticalAlignment="Center" Margin="5" Width="150" />
+            </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="2" Margin="10" HorizontalAlignment="Left">
+            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+            <extToolkit:CalculatorUpDown Margin="10" Width="250" 
+                                         Increment="{Binding Value, ElementName=_increment}"
+                                         Maximum="{Binding Value, ElementName=_maximum}"
+                                         Minimum="{Binding Value, ElementName=_minimum}"
+                                         Precision="{Binding Value, ElementName=_precision}" 
+                                         FormatString="{Binding SelectedItem.Tag, ElementName=_formatString}" 
+                                         Watermark="{Binding Text, ElementName=_watermark}"/>
+        </StackPanel>
     </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml
index 1ef6b570..b8b5db0a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml
@@ -2,8 +2,38 @@
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                      xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Calculator">
     <Grid>
-        <TextBlock Text="Calculator view" />
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <TextBlock Text="The Calculator is a control used for performing mathematical calculations."
+                   TextWrapping="Wrap" />
+
+        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
+            <Grid Margin="5">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="Precision: " VerticalAlignment="Center"  />
+                <extToolkit:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+            </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="2" Margin="10">
+            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+            <TextBlock Text="When the Calculator has focus, you can use the keyboard to interact with the key pad. Click the Calculator to give focus." Margin="10,0"/>
+            <extToolkit:Calculator Margin="10" Width="250"  Precision="{Binding Value, ElementName=_precision}"  />
+        </StackPanel>
     </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml
deleted file mode 100644
index 082909c0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<infControls:DemoView x:Class="Samples.Modules.Calculator.Views.HomeView"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                      Title="Calulator Controls">
-    <Grid>
-
-    </Grid>
-</infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml.cs
deleted file mode 100644
index e06fb18a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using Samples.Infrastructure.Controls;
-using Microsoft.Practices.Prism.Regions;
-
-namespace Samples.Modules.Calculator.Views
-{
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
-    {
-        public HomeView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml
deleted file mode 100644
index 9fe425cf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<TreeViewItem x:Class="Samples.Modules.Calculator.Views.NavigationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Calculator.Views"
-              Header="Calculator Controls" Tag="{x:Type views:HomeView}">
-
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
-
-    <TreeViewItem Header="Calculator" Tag="{x:Type views:CalculatorView}"/>
-    <TreeViewItem Header="CalculatorUpDown" Tag="{x:Type views:CalculatorUpDownView}"/>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml.cs
deleted file mode 100644
index 3bca58ee..00000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Samples.Modules.Calculator.Views
-{
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
-    {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
index b5ad89e6..0ceeaa69 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
@@ -222,7 +222,11 @@ namespace Microsoft.Windows.Controls
 
         private void Calculator_OnMouseDown(object sender, MouseButtonEventArgs e)
         {
-            Focus();
+            if (!IsFocused)
+            {
+                Focus();
+                e.Handled = true;
+            }
         }
 
         void Timer_Tick(object sender, EventArgs e)