diff --git a/Changelog.md b/Changelog.md
index 5d7a991..c43b70e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.4.0] - 2018-06-09
+### Added
+- Added `WithAdditionalContent` feature
+
+### Changed
+- `NotificationHeaderTextStyle` and `NotificationMessageTextStyle` are now aligned left horizontally (instead of stretched)
+
+### Fixed
+- `INotificationAnimation` interface is now marked as public
+
 ## [1.3.1] - 2018-05-30
 ### Fixed
 - Fixed message header foreground not set by `SetForeground` method call.
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml.cs
index 4317718..2c5da0a 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml.cs
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml.cs
@@ -1,17 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace Enterwell.Clients.Wpf.Notifications.Sample
+namespace Enterwell.Clients.Wpf.Notifications.Sample
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App
     {
     }
 }
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml
index 20b757f..ff265ba 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml
@@ -1,10 +1,10 @@
-<controls1:MetroWindow
+<mahapps:MetroWindow
     x:Class="Enterwell.Clients.Wpf.Notifications.Sample.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Enterwell.Clients.Wpf.Notifications.Controls;assembly=Enterwell.Clients.Wpf.Notifications"
-    xmlns:controls1="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="MainWindow"
     Width="900"
@@ -16,13 +16,16 @@
     WindowStartupLocation="CenterScreen"
     WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <controls1:MetroWindow.Resources>
+    <mahapps:MetroWindow.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Enterwell.Clients.Wpf.Notifications;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
-    </controls1:MetroWindow.Resources>
+    </mahapps:MetroWindow.Resources>
+    <mahapps:MetroWindow.WindowButtonCommands>
+        <mahapps:WindowButtonCommands Style="{DynamicResource MahApps.Metro.Styles.WindowButtonCommands.Win10}" />
+    </mahapps:MetroWindow.WindowButtonCommands>
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -38,7 +41,7 @@
             <controls:NotificationMessageContainer Manager="{Binding Manager}" />
         </Border>
 
-        <StackPanel
+        <WrapPanel
             Grid.Row="1"
             Grid.Column="0"
             Grid.ColumnSpan="3"
@@ -95,7 +98,37 @@
                 Content="Additional Content Areas"
                 Style="{StaticResource NotificationMessageButtonStyle}" />
 
-        </StackPanel>
+        </WrapPanel>
     </Grid>
-</controls1:MetroWindow>
+</mahapps:MetroWindow>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
index a77b7b0..c115374 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using Enterwell.Clients.Wpf.Notifications.Controls;
 
 namespace Enterwell.Clients.Wpf.Notifications.Sample
 {
@@ -92,16 +89,11 @@ private void ButtonBaseInfoDelayOnClick(object sender, RoutedEventArgs e)
 
         private void ButtonBaseAdditionalContentOnClick(object sender, RoutedEventArgs e)
         {
-            Thickness margin = new Thickness();
-            margin.Top = margin.Bottom = margin.Left = margin.Right = 5;
             this.Manager
                 .CreateMessage()
                 .Accent("#1751C3")
-                .Animates(true)
-                .AnimationInDuration(0.5)
-                .AnimationOutDuration(0.5)
                 .Background("#333")
-                .Foreground("#000")
+                .Foreground("#333")
                 .HasBadge("Info")
                 .HasHeader("Header")
                 .HasMessage("This is the message!")
@@ -140,23 +132,12 @@ private void ButtonBaseAdditionalContentOnClick(object sender, RoutedEventArgs e
                     HorizontalAlignment = HorizontalAlignment.Stretch,
                     Background = Brushes.Orange
                 })
-                .WithAdditionalContent(ContentLocation.OverBadge, new Border
+                .WithAdditionalContent(ContentLocation.AboveBadge, new Border
                 {
                     Height = 40,
                     Width = 40,
                     Background = Brushes.Indigo
                 })
-                .WithOverlay(new ProgressBar
-                {
-                    VerticalAlignment = VerticalAlignment.Bottom,
-                    HorizontalAlignment = HorizontalAlignment.Stretch,
-                    Height = 3,
-                    BorderThickness = new Thickness(0),
-                    Foreground = new SolidColorBrush(Color.FromArgb(128, 255, 255, 255)),
-                    Background = Brushes.Transparent,
-                    IsIndeterminate = true,
-                    IsHitTestVisible = false
-                })
                 .Dismiss().WithButton("Dismiss", button => { })
                 .Queue();
         }
diff --git a/Enterwell.Clients.Wpf.Notifications/ActionExtensions.cs b/Enterwell.Clients.Wpf.Notifications/ActionExtensions.cs
deleted file mode 100644
index 51d89c3..0000000
--- a/Enterwell.Clients.Wpf.Notifications/ActionExtensions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-
-namespace Enterwell.Clients.Wpf.Notifications
-{
-    /// <summary>
-    /// The <see cref="Action"/> extensions.
-    /// </summary>
-    internal static class ActionExtensions
-    {
-        /// <summary>
-        /// Invokes the specified action after first action was successfully invoked.
-        /// </summary>
-        /// <typeparam name="T1">The action data type.</typeparam>
-        /// <typeparam name="T2">The action data type.</typeparam>
-        /// <param name="baseAction">The base action.</param>
-        /// <param name="afterBaseAction">The after base action.</param>
-        /// <returns>Returns new action that first calls baseAction and then afterBaseAction.</returns>
-        public static Action<T1, T2> DoAfter<T1, T2>(this Action<T1, T2> baseAction, Action<T1, T2> afterBaseAction)
-        {
-            return (data1, data2) =>
-            {
-                baseAction?.Invoke(data1, data2);
-                afterBaseAction?.Invoke(data1, data2);
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Enterwell.Clients.Wpf.Notifications/ContentLocation.cs b/Enterwell.Clients.Wpf.Notifications/ContentLocation.cs
index 25e3097..7b27230 100644
--- a/Enterwell.Clients.Wpf.Notifications/ContentLocation.cs
+++ b/Enterwell.Clients.Wpf.Notifications/ContentLocation.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Enterwell.Clients.Wpf.Notifications
+namespace Enterwell.Clients.Wpf.Notifications
 {
+    /// <summary>
+    /// The additional content location.
+    /// </summary>
     public enum ContentLocation
     {
         Top,
@@ -13,6 +10,6 @@ public enum ContentLocation
         Left,
         Right,
         Main,
-        OverBadge
+        AboveBadge
     }
 }
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index db8a1e2..7d3622b 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -257,10 +257,7 @@ public double AnimationOutDuration
         /// <summary>
         /// The animatable element used for show/hide animations.
         /// </summary>
-        public UIElement AnimatableElement
-        {
-            get => this;
-        }
+        public UIElement AnimatableElement => this;
 
         /// <summary>
         /// The animation in.
@@ -327,7 +324,7 @@ public DependencyProperty AnimationInDependencyProperty
             get
             {
                 var property = (DependencyProperty)GetValue(AnimationInDependencyPropProperty);
-                return property ?? UIElement.OpacityProperty;
+                return property ?? OpacityProperty;
             }
             set => SetValue(AnimationInDependencyPropProperty, value);
         }
@@ -340,7 +337,7 @@ public DependencyProperty AnimationOutDependencyProperty
             get
             {
                 var property = (DependencyProperty)GetValue(AnimationOutDependencyPropProperty);
-                return property ?? UIElement.OpacityProperty;
+                return property ?? OpacityProperty;
             }
             set => SetValue(AnimationOutDependencyPropProperty, value);
         }
@@ -376,7 +373,7 @@ public DependencyProperty AnimationOutDependencyProperty
             DependencyProperty.Register("AdditionalContentRight", typeof(object), typeof(NotificationMessage), new PropertyMetadata(null));
 
         /// <summary>
-        /// The additional content center property.
+        /// The additional content main property.
         /// </summary>
         public static readonly DependencyProperty AdditionalContentMainProperty =
             DependencyProperty.Register("AdditionalContentMain", typeof(object), typeof(NotificationMessage), new PropertyMetadata(null));
@@ -400,8 +397,7 @@ public DependencyProperty AnimationOutDependencyProperty
         /// <param name="dependencyPropertyChangedEventArgs">The <see cref="DependencyPropertyChangedEventArgs" /> instance containing the event data.</param>
         private static void AccentBrushPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var @this = dependencyObject as NotificationMessage;
-            if (@this == null)
+            if (!(dependencyObject is NotificationMessage @this))
                 throw new NullReferenceException("Dependency object is not of valid type " + nameof(NotificationMessage));
 
             if (@this.BadgeAccentBrush == null)
@@ -446,8 +442,7 @@ private static void AccentBrushPropertyChangedCallback(DependencyObject dependen
         /// <param name="dependencyPropertyChangedEventArgs">The <see cref="DependencyPropertyChangedEventArgs" /> instance containing the event data.</param>
         private static void BadgeTextPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var @this = dependencyObject as NotificationMessage;
-            if (@this == null)
+            if (!(dependencyObject is NotificationMessage @this))
                 throw new NullReferenceException("Dependency object is not of valid type " + nameof(NotificationMessage));
 
             @this.BadgeVisibility = dependencyPropertyChangedEventArgs.NewValue == null
@@ -474,8 +469,7 @@ private static void BadgeTextPropertyChangedCallback(DependencyObject dependency
         /// <param name="dependencyPropertyChangedEventArgs">The <see cref="DependencyPropertyChangedEventArgs" /> instance containing the event data.</param>
         private static void HeaderPropertyChangesCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var @this = dependencyObject as NotificationMessage;
-            if (@this == null)
+            if (!(dependencyObject is NotificationMessage @this))
                 throw new NullReferenceException("Dependency object is not of valid type " + nameof(NotificationMessage));
 
             @this.HeaderVisibility = dependencyPropertyChangedEventArgs.NewValue == null
@@ -502,8 +496,7 @@ private static void HeaderPropertyChangesCallback(DependencyObject dependencyObj
         /// <param name="dependencyPropertyChangedEventArgs">The <see cref="DependencyPropertyChangedEventArgs" /> instance containing the event data.</param>
         private static void MessagePropertyChangesCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var @this = dependencyObject as NotificationMessage;
-            if (@this == null)
+            if (!(dependencyObject is NotificationMessage @this))
                 throw new NullReferenceException("Dependency object is not of valid type " + nameof(NotificationMessage));
 
             @this.MessageVisibility = dependencyPropertyChangedEventArgs.NewValue == null
@@ -576,7 +569,7 @@ public NotificationMessage()
         {
             this.Buttons = new ObservableCollection<object>();
 
-            //Setting the default text color, if not defined by user.
+            // Setting the default text color, if not defined by user.
             this.Foreground = new BrushConverter().ConvertFromString("#DDDDDD") as Brush;
         }
     }
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 9b97e2c..8fe5606 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media.Animation;
 
 namespace Enterwell.Clients.Wpf.Notifications.Controls
 {
@@ -19,8 +18,8 @@ public class NotificationMessageContainer : ItemsControl
         /// </value>
         public INotificationMessageManager Manager
         {
-            get { return (INotificationMessageManager)GetValue(ManagerProperty); }
-            set { SetValue(ManagerProperty, value); }
+            get => (INotificationMessageManager)this.GetValue(ManagerProperty);
+            set => this.SetValue(ManagerProperty, value);
         }
 
         /// <summary>
@@ -34,11 +33,10 @@ public INotificationMessageManager Manager
         /// </summary>
         /// <param name="dependencyObject">The dependency object.</param>
         /// <param name="dependencyPropertyChangedEventArgs">The <see cref="DependencyPropertyChangedEventArgs"/> instance containing the event data.</param>
-        /// <exception cref="NullReferenceException">Dependency object is not of valid type " + nameof(NotificationMessageContainer)</exception>
+        /// <exception cref="NullReferenceException">Dependency object is not of valid type - expected NotificationMessageContainer.</exception>
         private static void ManagerPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var @this = dependencyObject as NotificationMessageContainer;
-            if (@this == null)
+            if (!(dependencyObject is NotificationMessageContainer @this))
                 throw new NullReferenceException("Dependency object is not of valid type " + nameof(NotificationMessageContainer));
             
             if (dependencyPropertyChangedEventArgs.OldValue is INotificationMessageManager oldManager)
@@ -80,12 +78,13 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                 throw new InvalidOperationException(
                     "Can't use both ItemsSource and Items collection at the same time.");
 
-            if (args.Message is INotificationAnimation)
+            if (args.Message is INotificationAnimation animatableMessage)
             {
-                var animatableMessage = args.Message as INotificationAnimation;
                 var animation = animatableMessage.AnimationOut;
-                if (animatableMessage.Animates && animatableMessage.AnimatableElement != null
-                    && animation != null && animatableMessage.AnimationOutDependencyProperty != null)
+                if (animation != null && 
+                    animatableMessage.Animates && 
+                    animatableMessage.AnimatableElement != null && 
+                    animatableMessage.AnimationOutDependencyProperty != null)
                 {
                     animation.Completed += (s, a) => this.RemoveMessage(args.Message);
                     animatableMessage.AnimatableElement.BeginAnimation(animatableMessage.AnimationOutDependencyProperty, animation);
@@ -103,7 +102,7 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
 
         private void RemoveMessage(INotificationMessage message)
         {
-            this.Items?.Remove(message);
+            this.Items.Remove(message);
         }
 
         /// <summary>
@@ -118,11 +117,10 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
                 throw new InvalidOperationException(
                     "Can't use both ItemsSource and Items collection at the same time.");
 
-            this.Items?.Add(args.Message);
+            this.Items.Add(args.Message);
 
-            if (args.Message is INotificationAnimation)
+            if (args.Message is INotificationAnimation animatableMessage)
             {
-                var animatableMessage = args.Message as INotificationAnimation;
                 var animation = animatableMessage.AnimationIn;
                 if (animatableMessage.Animates && animatableMessage.AnimatableElement != null
                     && animation != null && animatableMessage.AnimationInDependencyProperty != null)
diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
index 8b6157c..130cdea 100644
--- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
+++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
@@ -53,7 +53,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ActionExtensions.cs" />
     <Compile Include="ContentLocation.cs" />
     <Compile Include="Controls\NotificationMessage.cs" />
     <Compile Include="Controls\NotificationMessageButton.cs" />
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
index 2803df5..eadc83e 100644
--- a/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
@@ -7,7 +7,7 @@ namespace Enterwell.Clients.Wpf.Notifications
     /// The animation properties for a notification message or some
     /// other item.
     /// </summary>
-    interface INotificationAnimation
+    public interface INotificationAnimation
     {
         /// <summary>
         /// Gets or sets whether the item animates in and out.
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
index b13f1fe..b8a5f1d 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
@@ -31,7 +31,7 @@ public class NotificationMessageBuilder
         /// <summary>
         /// Creates the message.
         /// </summary>
-        /// <returns>Returns new instance of notification message builder tha tis used to create notification message.</returns>
+        /// <returns>Returns new instance of notification message builder that is used to create notification message.</returns>
         public static NotificationMessageBuilder CreateMessage()
         {
             return new NotificationMessageBuilder();
@@ -171,33 +171,33 @@ public void SetForeground(Brush brush)
         /// <param name="animates"></param>
         public void SetAnimates(bool animates)
         {
-            if (this.Message is INotificationAnimation)
+            if (this.Message is INotificationAnimation animation)
             {
-                ((INotificationAnimation)this.Message).Animates = animates;
+                animation.Animates = animates;
             }
         }
 
         /// <summary>
         /// Sets the duration for the animation in (in seconds).
         /// </summary>
-        /// <param name="animates"></param>
+        /// <param name="duration">The in animation duration (in seconds).</param>
         public void SetAnimationInDuration(double duration)
         {
-            if (this.Message is INotificationAnimation)
+            if (this.Message is INotificationAnimation animation)
             {
-                ((INotificationAnimation)this.Message).AnimationInDuration = duration;
+                animation.AnimationInDuration = duration;
             }
         }
 
         /// <summary>
         /// Sets the duration for the animation out (in seconds).
         /// </summary>
-        /// <param name="animates"></param>
+        /// <param name="duration">The out animation duration (in seconds).</param>
         public void SetAnimationOutDuration(double duration)
         {
-            if (this.Message is INotificationAnimation)
+            if (this.Message is INotificationAnimation animation)
             {
-                ((INotificationAnimation)this.Message).AnimationOutDuration = duration;
+                animation.AnimationOutDuration = duration;
             }
         }
 
@@ -207,9 +207,9 @@ public void SetAnimationOutDuration(double duration)
         /// <param name="animation"></param>
         public void SetAnimationIn(AnimationTimeline animation)
         {
-            if (this.Message is INotificationAnimation)
+            if (this.Message is INotificationAnimation notificationAnimation)
             {
-                ((INotificationAnimation)this.Message).AnimationIn = animation;
+                notificationAnimation.AnimationIn = animation;
             }
         }
 
@@ -219,9 +219,9 @@ public void SetAnimationIn(AnimationTimeline animation)
         /// <param name="animation"></param>
         public void SetAnimationOut(AnimationTimeline animation)
         {
-            if (this.Message is INotificationAnimation)
+            if (this.Message is INotificationAnimation notificationAnimation)
             {
-                ((INotificationAnimation)this.Message).AnimationOut = animation;
+                notificationAnimation.AnimationOut = animation;
             }
         }
 
@@ -231,9 +231,9 @@ public void SetAnimationOut(AnimationTimeline animation)
         /// <param name="property"></param>
         public void SetAnimationInDependencyProperty(DependencyProperty property)
         {
-            if (this.Message is INotificationAnimation)
+            if (this.Message is INotificationAnimation animation)
             {
-                ((INotificationAnimation)this.Message).AnimationInDependencyProperty = property;
+                animation.AnimationInDependencyProperty = property;
             }
         }
 
@@ -243,9 +243,9 @@ public void SetAnimationInDependencyProperty(DependencyProperty property)
         /// <param name="property"></param>
         public void SetAnimationOutDependencyProperty(DependencyProperty property)
         {
-            if (this.Message is INotificationAnimation)
+            if (this.Message is INotificationAnimation animation)
             {
-                ((INotificationAnimation)this.Message).AnimationOutDependencyProperty = property;
+                animation.AnimationOutDependencyProperty = property;
             }
         }
 
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
index 53383f2..fca89be 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
@@ -2,6 +2,8 @@
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+// ReSharper disable UnusedMember.Global
+// ReSharper disable RedundantEmptySwitchSection
 
 namespace Enterwell.Clients.Wpf.Notifications
 {
@@ -11,11 +13,11 @@ namespace Enterwell.Clients.Wpf.Notifications
     public static class NotificationMessageBuilderLinq
     {
         /// <summary>
-        /// Sets the notification mesage background.
+        /// Sets the notification message background.
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="backgroundBrush">The background brush.</param>
-        /// <returns>Returns the noitificaiton message builder.</returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder Background(
             this NotificationMessageBuilder builder,
             Brush backgroundBrush)
@@ -26,11 +28,11 @@ public static NotificationMessageBuilder Background(
         }
 
         /// <summary>
-        /// Sets the notification mesage background.
+        /// Sets the notification message background.
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="backgroundBrush">The background brush.</param>
-        /// <returns>Returns the noitificaiton message builder.</returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder Background(
             this NotificationMessageBuilder builder,
             string backgroundBrush)
@@ -42,11 +44,11 @@ public static NotificationMessageBuilder Background(
         }
 
         /// <summary>
-        /// Sets the notification mesage accent.
+        /// Sets the notification message accent.
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="accentBrush">The accent brush.</param>
-        /// <returns>Returns the noitificaiton message builder.</returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder Accent(
             this NotificationMessageBuilder builder,
             Brush accentBrush)
@@ -57,11 +59,11 @@ public static NotificationMessageBuilder Accent(
         }
 
         /// <summary>
-        /// Sets the notification mesage accent.
+        /// Sets the notification message accent.
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="accentBrush">The accent brush.</param>
-        /// <returns>Returns the noitificaiton message builder.</returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder Accent(
             this NotificationMessageBuilder builder,
             string accentBrush)
@@ -134,10 +136,10 @@ public static NotificationMessageBuilder CreateMessage(
 
         /// <summary>
         /// Marks next button to be dismiss.
-        /// This button will dismiss the noitification message when clicked.
+        /// This button will dismiss the notification message when clicked.
         /// </summary>
         /// <param name="builder">The builder.</param>
-        /// <returns>Returns the notiification message builder.</returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder.DismissNotificationMessage Dismiss(
             this NotificationMessageBuilder builder)
         {
@@ -240,7 +242,7 @@ private static Action<INotificationMessage> DismissBefore(
         /// <param name="builder">The builder.</param>
         /// <param name="callback">The callback.</param>
         /// <returns>
-        /// Returns the action that will call manager dismiss for noitification 
+        /// Returns the action that will call manager dismiss for notification 
         /// message in builder when button is clicked and then call the callback action.
         /// </returns>
         private static Action<INotificationMessageButton> DismissBefore(
@@ -255,7 +257,7 @@ private static Action<INotificationMessageButton> DismissBefore(
         }
 
         /// <summary>
-        /// Sets the noitification message overlay.
+        /// Sets the notification message overlay.
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="overlay">The overlay.</param>
@@ -270,7 +272,7 @@ public static NotificationMessageBuilder WithOverlay(
         }
 
         /// <summary>
-        /// Sets the noitification message top additional content.
+        /// Sets the notification message top additional content.
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="additionalContent">The additional content.</param>
@@ -308,7 +310,7 @@ public static NotificationMessageBuilder WithAdditionalContent(
                         builder.SetAdditionalContentMain(additionalContent);
                         break;
                     }
-                case ContentLocation.OverBadge:
+                case ContentLocation.AboveBadge:
                     {
                         builder.SetAdditionalContentOverBadge(additionalContent);
                         break;
@@ -326,7 +328,7 @@ public static NotificationMessageBuilder WithAdditionalContent(
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="foregroundBrush">The foreground brush.</param>
-        /// <returns>Returns the noitificaiton message builder.</returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder Foreground(
             this NotificationMessageBuilder builder,
             string foregroundBrush)
@@ -342,7 +344,7 @@ public static NotificationMessageBuilder Foreground(
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="animates">Whether or not the message should animate.</param>
-        /// <returns></returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder Animates(
             this NotificationMessageBuilder builder,
             bool animates)
@@ -357,7 +359,7 @@ public static NotificationMessageBuilder Animates(
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="duration">How long the message should animate in (in seconds).</param>
-        /// <returns></returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder AnimationInDuration(
             this NotificationMessageBuilder builder,
             double duration)
@@ -372,7 +374,7 @@ public static NotificationMessageBuilder AnimationInDuration(
         /// </summary>
         /// <param name="builder">The builder.</param>
         /// <param name="duration">How long the message should animate out (in seconds).</param>
-        /// <returns></returns>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder AnimationOutDuration(
             this NotificationMessageBuilder builder,
             double duration)
@@ -386,8 +388,8 @@ public static NotificationMessageBuilder AnimationOutDuration(
         /// Sets the animation in for the message.
         /// </summary>
         /// <param name="builder">The builder.</param>
-        /// <param name="duration">The message animation in.</param>
-        /// <returns></returns>
+        /// <param name="animation">The animation time line.</param>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder AnimationIn(
             this NotificationMessageBuilder builder,
             AnimationTimeline animation)
@@ -401,8 +403,8 @@ public static NotificationMessageBuilder AnimationIn(
         /// Sets the animation out for the message.
         /// </summary>
         /// <param name="builder">The builder.</param>
-        /// <param name="duration">The message animation out.</param>
-        /// <returns></returns>
+        /// <param name="animation">The animation time line.</param>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder AnimationOut(
             this NotificationMessageBuilder builder,
             AnimationTimeline animation)
@@ -416,8 +418,8 @@ public static NotificationMessageBuilder AnimationOut(
         /// Sets the animation in dependency property for the message.
         /// </summary>
         /// <param name="builder">The builder.</param>
-        /// <param name="duration">The animation in dependency property.</param>
-        /// <returns></returns>
+        /// <param name="property">The animation in dependency property.</param>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder AnimationInDependencyProperty(
             this NotificationMessageBuilder builder,
             DependencyProperty property)
@@ -431,8 +433,8 @@ public static NotificationMessageBuilder AnimationInDependencyProperty(
         /// Sets the animation out dependency property for the message.
         /// </summary>
         /// <param name="builder">The builder.</param>
-        /// <param name="duration">The animation out dependency property.</param>
-        /// <returns></returns>
+        /// <param name="property">The animation out dependency property.</param>
+        /// <returns>Returns the notification message builder.</returns>
         public static NotificationMessageBuilder AnimationOutDependencyProperty(
             this NotificationMessageBuilder builder,
             DependencyProperty property)
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageFactory.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageFactory.cs
index 3281d92..9378288 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageFactory.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageFactory.cs
@@ -3,7 +3,7 @@
 namespace Enterwell.Clients.Wpf.Notifications
 {
     /// <summary>
-    /// The noitification message factory.
+    /// The notification message factory.
     /// </summary>
     /// <seealso cref="INotificationMessageFactory" />
     public class NotificationMessageFactory : INotificationMessageFactory
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageManagerEventArgs.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageManagerEventArgs.cs
index 2a78063..13f7ab0 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageManagerEventArgs.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageManagerEventArgs.cs
@@ -3,7 +3,7 @@
 namespace Enterwell.Clients.Wpf.Notifications
 {
     /// <summary>
-    /// The notificaiton message manager event arguments.
+    /// The notification message manager event arguments.
     /// </summary>
     /// <seealso cref="EventArgs" />
     public class NotificationMessageManagerEventArgs : EventArgs
diff --git a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
index 8e89c65..b1da2fd 100644
--- a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml b/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml
index c21b405..1663931 100644
--- a/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml
+++ b/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:Enterwell.Clients.Wpf.Notifications.Controls"
-                    xmlns:local="clr-namespace:Enterwell.Clients.Wpf.Notifications">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Enterwell.Clients.Wpf.Notifications.Controls"
+    xmlns:local="clr-namespace:Enterwell.Clients.Wpf.Notifications">
 
     <SolidColorBrush x:Key="NotificationButtonDarkBackgroundOverlayBrush">#333333</SolidColorBrush>
     <SolidColorBrush x:Key="NotificationButtonDarkBackgroundOverlayPressedBrush">#666666</SolidColorBrush>
@@ -17,6 +18,13 @@
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
+    <Style x:Key="NotificationAdditionalContentOverBadgeStyle" TargetType="{x:Type ContentControl}">
+        <Setter Property="Margin" Value="10,2,0,2" />
+        <Setter Property="Padding" Value="4,2" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
     <Style x:Key="NotificationHeaderTextStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="16" />
         <Setter Property="FontWeight" Value="Light" />
@@ -24,12 +32,14 @@
         <Setter Property="Margin" Value="0,0,8,0" />
         <Setter Property="TextWrapping" Value="Wrap" />
         <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
     </Style>
 
     <Style x:Key="NotificationMessageTextStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:NotificationMessage}}, Path=Foreground}" />
         <Setter Property="Margin" Value="0,0,8,0" />
         <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
@@ -41,25 +51,28 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Grid>
-                        <Border x:Name="backgroundBorder"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding Background}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                SnapsToDevicePixels="True" />
-                        <Border x:Name="backgroundOverlay"
-                                BorderThickness="0"
-                                Opacity="0.3"
-                                SnapsToDevicePixels="True" />
-                        <ContentPresenter x:Name="contentPresenter"
-                                          Margin="{TemplateBinding Padding}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          Focusable="False"
-                                          RecognizesAccessKey="True"
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Border
+                            x:Name="backgroundBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True" />
+                        <Border
+                            x:Name="backgroundOverlay"
+                            BorderThickness="0"
+                            Opacity="0.3"
+                            SnapsToDevicePixels="True" />
+                        <ContentPresenter
+                            x:Name="contentPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Focusable="False"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Button.IsDefaulted" Value="True">
@@ -85,28 +98,29 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NotificationMessage}">
-                    <!-- Border for the Notification Message -->
-                    <Border x:Name="notificationMessageBorder" MinHeight="35"
-                            VerticalAlignment="Top"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="#882F2F2F"
-                            BorderThickness="0,0,0,1"
-                            SnapsToDevicePixels="True"
-                            UseLayoutRounding="True">
-                        <!-- Outer Grid -->
+                    <!--  Border for the Notification Message  -->
+                    <Border
+                        x:Name="notificationMessageBorder"
+                        MinHeight="35"
+                        VerticalAlignment="Top"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="#882F2F2F"
+                        BorderThickness="0,0,0,1"
+                        SnapsToDevicePixels="True"
+                        UseLayoutRounding="True">
+                        <!--  Outer Grid  -->
                         <Grid x:Name="outerGrid">
                             <Grid.Resources>
                                 <!--  Accent Button Style  -->
                                 <Style BasedOn="{StaticResource NotificationMessageButtonStyle}" TargetType="{x:Type controls:NotificationMessageButton}">
-                                    <Setter Property="Background" 
-                                            Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:NotificationMessage}}, Path=ButtonAccentBrush}" />
+                                    <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:NotificationMessage}}, Path=ButtonAccentBrush}" />
                                 </Style>
                                 <!--  Accent Badge Style  -->
-                                <Style x:Key="NotificationBadgeAccentStyle"
-                                       BasedOn="{StaticResource NotificationBadgeBaseStyle}"
-                                       TargetType="{x:Type TextBlock}">
-                                    <Setter Property="Background" 
-                                            Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:NotificationMessage}}, Path=BadgeAccentBrush}" />
+                                <Style
+                                    x:Key="NotificationBadgeAccentStyle"
+                                    BasedOn="{StaticResource NotificationBadgeBaseStyle}"
+                                    TargetType="{x:Type TextBlock}">
+                                    <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:NotificationMessage}}, Path=BadgeAccentBrush}" />
                                 </Style>
                             </Grid.Resources>
                             <Grid.ColumnDefinitions>
@@ -120,105 +134,116 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
-                            
-                            <!-- Additional Content - Outer Grid-->
-                            <ContentControl x:Name="additionalContentTop"
-                                            Grid.Row="0"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="4"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding AdditionalContentTop}" />
-                            <ContentControl x:Name="additionalContentBottom"
-                                            Grid.Row="2"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="4"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding AdditionalContentBottom}" />
-                            <ContentControl x:Name="additionalContentLeft"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding AdditionalContentLeft}" />
-                            <ContentControl x:Name="additionalContentRight"
-                                            Grid.Row="1"
-                                            Grid.Column="3"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding AdditionalContentRight}" />
-                            <ContentControl x:Name="additionalContentCenter"
-                                            Grid.Row="1"
-                                            Grid.Column="1"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding AdditionalContentMain}" />
 
-                            <!-- Inner Grid -->
-                            <Grid x:Name="innerGrid" 
-                                  Grid.Column="1" 
-                                  Grid.Row="1" 
-                                  VerticalAlignment="Stretch" 
-                                  HorizontalAlignment="Stretch">
+                            <!--  Additional Content - Outer Grid  -->
+                            <ContentControl
+                                x:Name="additionalContentTop"
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="4"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{TemplateBinding AdditionalContentTop}" />
+                            <ContentControl
+                                x:Name="additionalContentBottom"
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="4"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{TemplateBinding AdditionalContentBottom}" />
+                            <ContentControl
+                                x:Name="additionalContentLeft"
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{TemplateBinding AdditionalContentLeft}" />
+                            <ContentControl
+                                x:Name="additionalContentRight"
+                                Grid.Row="1"
+                                Grid.Column="3"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{TemplateBinding AdditionalContentRight}" />
+                            <ContentControl
+                                x:Name="additionalContentCenter"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{TemplateBinding AdditionalContentMain}" />
+
+                            <!--  Inner Grid  -->
+                            <Grid
+                                x:Name="innerGrid"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                <!-- Badge Grid -->
-                                <Grid x:Name="badgeGrid" 
-                                      Grid.Column="0" 
-                                      VerticalAlignment="Stretch" 
-                                      HorizontalAlignment="Stretch">
+                                <!--  Badge Grid  -->
+                                <Grid
+                                    x:Name="badgeGrid"
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="*" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="*" />
                                     </Grid.RowDefinitions>
-                                    <!-- Additional Content - Over Badge -->
-                                    <ContentControl x:Name="additionalContentOverBadge"
-                                                    Grid.Row="1"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    Margin="10,2,0,2"
-                                                    Padding="4,2"
-                                                    Content="{TemplateBinding AdditionalContentOverBadge}" />
+                                    <!--  Additional Content - Over Badge  -->
+                                    <ContentControl
+                                        x:Name="additionalContentOverBadge"
+                                        Grid.Row="1"
+                                        Content="{TemplateBinding AdditionalContentOverBadge}"
+                                        Style="{StaticResource NotificationAdditionalContentOverBadgeStyle}" />
                                     <!--  Badge  -->
-                                    <TextBlock Grid.Row="2"
-                                               Style="{StaticResource NotificationBadgeAccentStyle}"
-                                               Text="{TemplateBinding BadgeText}"
-                                               Visibility="{TemplateBinding BadgeVisibility}" />
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Style="{StaticResource NotificationBadgeAccentStyle}"
+                                        Text="{TemplateBinding BadgeText}"
+                                        Visibility="{TemplateBinding BadgeVisibility}" />
                                 </Grid>
-                                <!-- Text Grid -->
-                                <Grid x:Name="textGrid" 
-                                      Grid.Column="1" 
-                                      VerticalAlignment="Stretch" 
-                                      HorizontalAlignment="Stretch"
-                                      Margin="10,8">
+                                <!--  Text Grid  -->
+                                <Grid
+                                    x:Name="textGrid"
+                                    Grid.Column="1"
+                                    Margin="10,8"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="*" />
                                     </Grid.RowDefinitions>
                                     <!--  Header and Message  -->
-                                    <TextBlock x:Name="headerTextBlock"
-                                               Grid.Row="0"
-                                               Style="{StaticResource NotificationHeaderTextStyle}"
-                                               Text="{TemplateBinding Header}"
-                                               Visibility="{TemplateBinding HeaderVisibility}" />
-                                    <TextBlock x:Name="messageTextBlock"
-                                               Grid.Row="1"
-                                               Style="{StaticResource NotificationMessageTextStyle}"
-                                               Text="{TemplateBinding Message}"
-                                               Visibility="{TemplateBinding MessageVisibility}" />
+                                    <TextBlock
+                                        x:Name="headerTextBlock"
+                                        Grid.Row="0"
+                                        Style="{StaticResource NotificationHeaderTextStyle}"
+                                        Text="{TemplateBinding Header}"
+                                        Visibility="{TemplateBinding HeaderVisibility}" />
+                                    <TextBlock
+                                        x:Name="messageTextBlock"
+                                        Grid.Row="1"
+                                        Style="{StaticResource NotificationMessageTextStyle}"
+                                        Text="{TemplateBinding Message}"
+                                        Visibility="{TemplateBinding MessageVisibility}" />
                                 </Grid>
                             </Grid>
 
                             <!--  Buttons  -->
-                            <ItemsControl Grid.Column="2"
-                                          Grid.Row="1"
-                                          ItemsSource="{TemplateBinding Buttons}" VerticalAlignment="Stretch"
-                                          HorizontalAlignment="Stretch">
+                            <ItemsControl
+                                Grid.Row="1"
+                                Grid.Column="2"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                ItemsSource="{TemplateBinding Buttons}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <StackPanel Orientation="Horizontal" />
@@ -232,14 +257,15 @@
                             </ItemsControl>
 
                             <!--  Overlay Content  -->
-                            <ContentControl x:Name="overlayContainer"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="4"
-                                            Grid.Row="0"
-                                            Grid.RowSpan="3"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding OverlayContent}" />
+                            <ContentControl
+                                x:Name="overlayContainer"
+                                Grid.Row="0"
+                                Grid.RowSpan="3"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="4"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{TemplateBinding OverlayContent}" />
                         </Grid>
                     </Border>
                 </ControlTemplate>
@@ -260,18 +286,20 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NotificationMessageContainer}">
                     <Grid>
-                        <Border x:Name="ItemsBorder"
-                                Margin="12,0,12,12"
-                                Padding="{TemplateBinding Padding}"
-                                Background="{TemplateBinding Background}"
-                                SnapsToDevicePixels="true"
-                                UseLayoutRounding="True">
+                        <Border
+                            x:Name="ItemsBorder"
+                            Margin="12,0,12,12"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            SnapsToDevicePixels="true"
+                            UseLayoutRounding="True">
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                                 <ItemsPresenter.Effect>
-                                    <DropShadowEffect BlurRadius="10"
-                                                      Direction="270"
-                                                      Opacity="0.3"
-                                                      Color="Black" />
+                                    <DropShadowEffect
+                                        BlurRadius="10"
+                                        Direction="270"
+                                        Opacity="0.3"
+                                        Color="Black" />
                                 </ItemsPresenter.Effect>
                             </ItemsPresenter>
                         </Border>
diff --git a/Readme.md b/Readme.md
index 0e1df72..a7d1465 100644
--- a/Readme.md
+++ b/Readme.md
@@ -116,6 +116,23 @@ manager.CreateMessage()
 
 The `WithOverlay` allows you to set custom overlay content. In this example a progress bar is placed on the bottom of notification control. Notice the `IsHitTextVisible` is set to `false` so that notification message buttons don't lose focus due to overlay control being over the bottom part of the buttons.
 
+### Custom additional content for notification
+
+```c#
+manager.CreateMessage()
+       .Accent("#F15B19")
+       .Background("#F15B19")
+       .HasHeader("Lost connection to server")
+       .HasMessage("Reconnecting...")
+       .WithAdditionalContent(ContentLocation.Main, new CheckBox
+	   {
+           Margin = new Thickness(16),
+		   HorizontalAlignment = HorizontalAlignment.Right,
+		   Content = "Don't show again"
+	   })
+       .Queue();
+```
+
 ### Multiple notification
 
 The `NotificationMessageContainer` has build-in support for showing multiple notifications at the same time. New notifications will show at the bottom of the message stack.