diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs
index d24edbec..f96f47e9 100644
--- a/Sources/AssemblyVersionAuto.cs
+++ b/Sources/AssemblyVersionAuto.cs
@@ -3,6 +3,6 @@
 
 
 [assembly: AssemblyCopyright("Copyright ? 2018 Episerver")]
-[assembly: AssemblyVersion("11.8.0.0")]
-[assembly: AssemblyInformationalVersion("11.8.0")]
-[assembly: AssemblyFileVersion("11.8.0.2905")]
+[assembly: AssemblyVersion("11.8.1.0")]
+[assembly: AssemblyInformationalVersion("11.8.1")]
+[assembly: AssemblyFileVersion("11.8.1.2916")]
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.resx
index 7bd54dae..524c2a21 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.resx
+++ b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.resx
@@ -870,6 +870,9 @@
   <data name="CancelOrderConfirmation" xml:space="preserve">
     <value>Are you sure you want to cancel current purchase order?</value>
   </data>
+  <data name="CancelPaymentPlanConfirmation" xml:space="preserve">
+    <value>Are you sure you want to cancel current payment plan?</value>
+  </data>
   <data name="CancelReturnConfirmation" xml:space="preserve">
     <value>Are you sure you want to cancel current return request?</value>
   </data>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx
index 8fbeadc8..8d7e104a 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx
+++ b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx
@@ -867,6 +867,9 @@
   <data name="CancelOrderConfirmation" xml:space="preserve">
     <value>Vill du avbryta aktuell inköpsorder?</value>
   </data>
+  <data name="CancelPaymentPlanConfirmation" xml:space="preserve">
+    <value>Vill du avbryta aktuell betalningsplan?</value>
+  </data>
   <data name="CancelReturnConfirmation" xml:space="preserve">
     <value>Vill du avbryta aktuell returbegäran?</value>
   </data>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Tabs/CatalogOverviewEditTab.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Tabs/CatalogOverviewEditTab.ascx
index 0c2101e6..e20238d0 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Tabs/CatalogOverviewEditTab.ascx
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Tabs/CatalogOverviewEditTab.ascx
@@ -78,7 +78,7 @@
                 <asp:Label runat="server" Text="<%$ Resources:CatalogStrings, Catalog_Catalog_Name %>"></asp:Label>:
             </td>
             <td class="FormFieldCell">
-                <asp:TextBox runat="server" Width="250" ID="CatalogName"></asp:TextBox>
+                <asp:TextBox runat="server" Width="250" ID="CatalogName" MaxLength="100"></asp:TextBox>
                 <asp:RequiredFieldValidator runat="server" ID="CatalogNameRequired" ControlToValidate="CatalogName"
                     Display="Dynamic" ErrorMessage="<%$ Resources:CatalogStrings, Catalog_Catalog_Name_Required %>" />
                 <asp:CustomValidator runat="server" ID="NameUniqueCustomValidator" ControlToValidate="CatalogName"
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/ColumnTemplates/ColumnsActions.GridEntity.CustomPage.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/ColumnTemplates/ColumnsActions.GridEntity.CustomPage.ascx
new file mode 100644
index 00000000..6aeac563
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/ColumnTemplates/ColumnsActions.GridEntity.CustomPage.ascx
@@ -0,0 +1,138 @@
+<%@ Control Language="C#" AutoEventWireup="true" Inherits="Mediachase.BusinessFoundation.CustomColumnBaseEntityType" ClassName="Mediachase.Commerce.Manager.Apps.Customization.ColumnTemplates.ColumnsActions_GridEntity_CustomPage" %>
+<%@ Import Namespace="System.Collections.Generic" %>
+<%@ Import Namespace="System.Globalization" %>
+<%@ Import Namespace="System.IO" %>
+<%@ Import Namespace="System.Web.Hosting" %>
+<%@ Import Namespace="System.Xml.XPath" %>
+
+<%@ Import Namespace="Mediachase.BusinessFoundation" %>
+<%@ Import Namespace="Mediachase.BusinessFoundation.Data.Business" %>
+<%@ Import Namespace="Mediachase.BusinessFoundation.Data.Meta.Management" %>
+<%@ Import Namespace="Mediachase.Commerce.Customization" %>
+<%@ Import Namespace="Mediachase.Commerce.Customization.Plugins" %>
+
+<script language="c#" runat="server">
+	protected string GetValue(EntityObject DataItem)
+	{
+		string retVal = "";
+		if (DataItem != null && DataItem.PrimaryKeyId.HasValue)
+			retVal = BindAction(DataItem);
+		else if (DataItem != null)
+			RegisterCommands(DataItem);
+		return retVal;
+	}
+
+	void RegisterCommands(EntityObject DataItem)
+	{
+		string ownClassName = DataItem.MetaClassName;
+		MetaClass ownClass = MetaDataWrapper.GetMetaClassByName(DataItem.MetaClassName);
+		if (ownClass.CardOwner != null)
+			ownClassName = ownClass.CardOwner.Name;
+
+		IXPathNavigable navigable = Mediachase.BusinessFoundation.XmlBuilder.GetXml(StructureType.ListViewUI, new Selector(ownClassName, this.ViewName, this.Place));
+		XPathNavigator actions = navigable.CreateNavigator().SelectSingleNode("ListViewUI/Grid/CustomColumns");
+
+		foreach (XPathNavigator gridItem in actions.SelectChildren("Column", string.Empty))
+		{
+			string type = gridItem.GetAttribute("type", string.Empty);
+			string id = gridItem.GetAttribute("id", string.Empty);
+
+			if (type == "ColumnsActions" && id == this.ColumnId)
+			{
+				foreach (XPathNavigator actionItem in gridItem.SelectChildren("Item", string.Empty))
+				{
+					string commandName = actionItem.GetAttribute("commandName", string.Empty);
+					CommandManager.GetCurrent(this.Page).AddCommand(ownClassName, this.ViewName, this.Place, commandName);
+				}
+			}
+		}
+	}
+	
+	#region BindAction
+	/// <summary>
+	/// Binds the action.
+	/// </summary>
+	string BindAction(EntityObject DataItem)
+	{	
+		string retVal = string.Empty;
+
+		string ownClassName = DataItem.MetaClassName;
+		MetaClass ownClass = MetaDataWrapper.GetMetaClassByName(DataItem.MetaClassName);
+		if (ownClass.CardOwner != null)
+			ownClassName = ownClass.CardOwner.Name;
+
+		IXPathNavigable navigable = Mediachase.BusinessFoundation.XmlBuilder.GetXml(StructureType.ListViewUI, new Selector(ownClassName, this.ViewName, this.Place));
+		XPathNavigator actions = navigable.CreateNavigator().SelectSingleNode("ListViewUI/Grid/CustomColumns");
+
+		foreach (XPathNavigator gridItem in actions.SelectChildren("Column", string.Empty))
+		{
+			string type = gridItem.GetAttribute("type", string.Empty);
+			string id = gridItem.GetAttribute("id", string.Empty);
+
+			if (type == "ColumnsActions" && id == this.ColumnId)
+			{
+				foreach (XPathNavigator actionItem in gridItem.SelectChildren("Item", string.Empty))
+				{
+					string imageUrl = actionItem.GetAttribute("imageUrl", string.Empty);
+					string commandName = actionItem.GetAttribute("commandName", string.Empty);
+					string paddingLeft = actionItem.GetAttribute("paddingLeft", string.Empty);
+					string paddingRight = actionItem.GetAttribute("paddingRight", string.Empty);
+					string tooltip = actionItem.GetAttribute("tooltip", string.Empty);
+
+					Dictionary<string, string> dic = new Dictionary<string, string>();
+
+					if (this.DataItem == null)
+						dic.Add("primaryKeyId", "");
+					else if (!DataItem.PrimaryKeyId.HasValue)
+						dic.Add("primaryKeyId", "");
+					else
+						dic.Add("primaryKeyId", DataItem.PrimaryKeyId.ToString());
+					
+					if (DataItem.Properties.Contains(CustomPageNormalizationPlugin.FieldNameCreatedLevel))
+						dic.Add(CustomPageNormalizationPlugin.FieldNameCreatedLevel, ((int)(CustomPageLevel)DataItem.Properties[CustomPageNormalizationPlugin.FieldNameCreatedLevel].Value).ToString());
+					if (DataItem.Properties.Contains(CustomPageNormalizationPlugin.FieldNameModifiedLevel))
+						dic.Add(CustomPageNormalizationPlugin.FieldNameModifiedLevel, ((int)(CustomPageLevel)DataItem.Properties[CustomPageNormalizationPlugin.FieldNameModifiedLevel].Value).ToString());
+					if (DataItem.Properties.Contains(CustomPageEntity.FieldUid))
+						dic.Add(CustomPageEntity.FieldUid, DataItem.Properties[CustomPageEntity.FieldUid].Value.ToString());
+					
+					dic.Add("className", DataItem.MetaClassName);
+					CommandParameters cp = new CommandParameters(commandName, dic);
+					bool isEnable = true;
+					string clientScript = CommandManager.GetCurrent(this.Page).AddCommand(ownClassName, this.ViewName, this.Place, cp, out isEnable);
+					imageUrl = this.ResolveClientUrl(imageUrl);
+
+					//create ImageButton control			
+					ImageButton img = new ImageButton();
+					img.ImageUrl = imageUrl;
+
+					if (tooltip != string.Empty)
+					{
+						tooltip = Mediachase.Ibn.Web.UI.CHelper.GetResFileString(tooltip);
+						img.ToolTip = tooltip;
+					}					
+					
+					img.OnClientClick = string.Format("{0}; return false;", clientScript);
+					
+					if (paddingRight != string.Empty)
+						img.Style.Add(HtmlTextWriterStyle.PaddingRight, paddingRight + "px");
+					
+					if (paddingLeft != string.Empty)
+						img.Style.Add(HtmlTextWriterStyle.PaddingLeft, paddingLeft + "px");
+
+					//ImageButton control -> toString()
+					StringBuilder sb = new StringBuilder();
+					StringWriter tw = new StringWriter(sb);
+					HtmlTextWriter hw = new HtmlTextWriter(tw);
+					img.RenderControl(hw);
+					//add image button
+					if (isEnable)
+						retVal += sb.ToString();
+				}
+			}
+		}
+
+		return retVal;
+	}
+	#endregion	
+</script>
+<%# GetValue(DataItem) %>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/ListViewProfiles/CustomPage.@.@.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/ListViewProfiles/CustomPage.@.@.xml
new file mode 100644
index 00000000..a2c6d5c0
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/ListViewProfiles/CustomPage.@.@.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ListViewProfile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<Id>{FDFA05F5-D146-4b6d-9434-BA1B9DE2230B}</Id>
+	<Name>CustomPage</Name>
+	<IsSystem>true</IsSystem>
+	<IsPublic>true</IsPublic>
+	<FieldSetName>CustomPage</FieldSetName>
+	<FieldSet>
+		<string>Title</string>
+		<string>Description</string>
+	</FieldSet>
+	<Filters>
+	</Filters>
+	<ColumnsUI>
+		<Column field="Title" width="200px" title="{Global:_mc_Title}" />
+		<Column field="Description" width="400px" title="{Global:_mc_Description}" />
+	</ColumnsUI>
+</ListViewProfile>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/ListViewUI/CustomPage.@.PageList.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/ListViewUI/CustomPage.@.PageList.xml
new file mode 100644
index 00000000..7f341243
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/ListViewUI/CustomPage.@.PageList.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ListViewUI>
+	<Toolbar>
+		<clear/>
+		<add>
+			<Button id="NewItemButton" text="{Common:NewCustomPage}" imageUrl="~/Apps/MetaDatabase/images/newitem.gif" commandName="MC_WE_NewPage" itemSplitter="Right"></Button>
+		</add>
+	</Toolbar>
+	<Grid>
+		<add>
+			<CustomColumns id="CustomPages_Columns">
+				<Column id="460743ED-0CB4-41C5-8BA1-5C479D694F2C" type="ColumnsActions" templateUrl="~/Apps/Customization/ColumnTemplates/ColumnsActions.GridEntity.CustomPage.ascx">
+					<Item imageUrl="~/Apps/MetaDatabase/images/Publish.png" commandName="MC_WE_PublishPage" paddingRight="5" tooltip="{GlobalMetaInfo:Publish}" />
+					<Item imageUrl="~/Apps/MetaDatabase/images/edit.gif" commandName="MC_WE_EditPage" paddingRight="5" tooltip="{Common:Edit}" />
+					<Item imageUrl="~/Apps/MetaDatabase/images/undo.png" commandName="MC_WE_PageUndo" paddingRight="5" tooltip="{Common:Undo}" />
+					<Item imageUrl="~/Apps/MetaDatabase/images/delete.gif" commandName="MC_WE_PageDelete" paddingRight="5" tooltip="{Common:Delete}" />
+				</Column>
+			</CustomColumns>
+		</add>
+	</Grid>
+	<Commands>
+		<clear/>
+		<add>
+			<Command id="MC_WE_NewPage">
+				<CommandType>Navigate</CommandType>
+				<Url>~/Apps/Customization/Pages/CustomPageEdit.aspx</Url>
+			</Command>
+			<Command id="MC_WE_EditPage">
+				<CommandType>Navigate</CommandType>
+				<Url>~/Apps/Customization/Pages/CustomPageEdit.aspx?Id=[ClientParam:primaryKeyId]</Url>
+			</Command>
+			<Command id="MC_WE_PageUndo">
+				<CommandType>ServerAction</CommandType>
+				<Handler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.UndoPageHandler, Mediachase.ConsoleManager" />
+				<EnableHandler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.UndoPageEnableHandler, Mediachase.ConsoleManager" />
+				<ConfirmationText>{Common:UndoChanges}</ConfirmationText>
+			</Command>
+			<Command id="MC_WE_PageDelete">
+				<CommandType>ServerAction</CommandType>
+				<Handler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.DeletePageHandler, Mediachase.ConsoleManager" />
+				<EnableHandler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.DeletePageEnableHandler, Mediachase.ConsoleManager" />
+				<ConfirmationText>{Common:DeleteItemConfirmation}</ConfirmationText>
+			</Command>
+			<Command id="MC_WE_PublishPage">
+				<CommandType>OpenFrameModalPopup</CommandType>
+				<PopupTitle>{GlobalMetaInfo:Publication}</PopupTitle>
+				<Url>~/Apps/Customization/Pages/CustomPagePublish.aspx?Uid=[ClientParam:Uid]</Url>
+				<Width>750</Width>
+				<Height>485</Height>
+				<Top>55</Top>
+				<Left>55</Left>
+				<Drag>True</Drag>
+			</Command>
+		</add>
+	</Commands>
+</ListViewUI>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/MetaView/@.Customization.LeftMenuItem-List.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/MetaView/@.Customization.LeftMenuItem-List.xml
new file mode 100644
index 00000000..114165c8
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/MetaView/@.Customization.LeftMenuItem-List.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MetaView>
+  <Toolbar>
+    <add>
+      <Button id="AddLeftMenuItemButton" text="{Global:_mc_Add}" imageUrl="~/Apps/Shell/styles/Images/new.png" commandName="cmdCustomizationNewLeftMenuItem" permission="customization:admin:menu:new"/>
+    </add>
+  </Toolbar>
+
+  <Commands>
+    <add>
+      <Command id="cmdCustomizationNewLeftMenuItem">
+        <CommandType>OpenFrameModalPopup</CommandType>
+        <PopupTitle>{Common:Adding}</PopupTitle>
+        <Url>~/Apps/Customization/Pages/LeftMenuItemAdd.aspx</Url>
+        <Width>800</Width>
+        <Height>485</Height>
+        <Top>55</Top>
+        <Left>50</Left>
+        <Drag>True</Drag>
+		<EnableHandler type="Mediachase.Commerce.Manager.Apps.Core.CommandHandlers.Common.CommandHandlerBase, Mediachase.ConsoleManager" />
+      </Command>
+
+      <!-- Grid commands -->
+      <Command id="cmdCustomizationGridLeftMenuItemEdit">
+        <CommandType>OpenFrameModalPopup</CommandType>
+        <PopupTitle>{Common:Editing}</PopupTitle>
+        <Url>~/Apps/Customization/Pages/LeftMenuItemEdit.aspx?FullId=[ClientParam:primaryKeyId]&amp;added=[ClientParam:added]</Url>
+        <Width>500</Width>
+        <Height>280</Height>
+        <Top>55</Top>
+        <Left>100</Left>
+        <Drag>True</Drag>
+		<EnableHandler type="Mediachase.Commerce.Manager.Apps.Core.CommandHandlers.Common.CommandHandlerBase, Mediachase.ConsoleManager" />
+      </Command>
+
+      <Command id="cmdCustomizationGridLeftMenuItemDelete">
+        <CommandType>ServerAction</CommandType>
+        <Handler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.LeftMenuItemDeleteHandler, Mediachase.ConsoleManager" />
+        <UpdatePanelIds>panelMainListView</UpdatePanelIds>
+        <EnableHandler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.LeftMenuItemDeleteEnableHandler, Mediachase.ConsoleManager" />
+        <ConfirmationText>{Common:DeleteItemConfirmation}</ConfirmationText>
+      </Command>
+    </add>
+  </Commands>
+</MetaView>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/MetaView/Portal.PortalCustomization.PortalCustomization.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/MetaView/Portal.PortalCustomization.PortalCustomization.xml
new file mode 100644
index 00000000..032dcca4
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/MetaView/Portal.PortalCustomization.PortalCustomization.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MetaView>
+	<Toolbar>
+		<add>
+			<Text text="{Common:PortalCustomization}" cssClass="ibn-WPTitle"></Text>
+		</add>
+	</Toolbar>
+	<Grid>
+	</Grid>
+	<Commands>
+	</Commands>
+</MetaView>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/View/LeftMenuItem-List.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/View/LeftMenuItem-List.xml
new file mode 100644
index 00000000..bef8ca0c
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/View/LeftMenuItem-List.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns="http://schemas.mediachase.com/ecf/view">
+	<ListViewUI>
+		<Grid>
+			<add>
+				<Columns>
+					<Column width="50" allowSorting="false" dataField="FullId" headingText="" columnType="CustomTemplate">
+						<Template id="ItemActionsTemplate" controlUrl="GridTemplates/LeftMenuItemActionsTemplate.ascx" />
+					</Column>
+                    <!--<Column visible="true" width="100" dataField="Added" headingText="Added" />
+					<Column visible="true" width="100" dataField="FullId" headingText="FullId" />-->
+					<Column width="400" allowSorting="true" dataField="Title" headingText="{Common:Title}" />
+					<Column width="100" allowSorting="true" dataField="Order" headingText="{Common:Order}" />
+				</Columns>
+			</add>
+		</Grid>
+		<Toolbar>
+			<add>
+				<Button id="AddLeftMenuItemButton" text="{Global:_mc_Add}" imageUrl="~/Apps/Shell/styles/Images/new.png" commandName="cmdCustomizationNewLeftMenuItem" permissions="core:mng:leftmenu"/>
+			</add>
+		</Toolbar>
+
+		<Commands>
+			<add>
+				<Command id="cmdCustomizationNewLeftMenuItem">
+					<CommandType>OpenFrameModalPopup</CommandType>
+					<PopupTitle>{Common:Adding}</PopupTitle>
+					<Url>~/Apps/Customization/Pages/LeftMenuItemAdd.aspx</Url>
+					<Width>800</Width>
+					<Height>485</Height>
+					<Top>55</Top>
+					<Left>50</Left>
+					<Drag>True</Drag>
+					<EnableHandler type="Mediachase.Commerce.Manager.Apps.Core.CommandHandlers.Common.CommandHandlerBase, Mediachase.ConsoleManager" />
+				</Command>
+
+				<!-- Grid commands -->
+				<Command id="cmdCustomizationGridLeftMenuItemEdit">
+					<CommandType>OpenFrameModalPopup</CommandType>
+					<PopupTitle>{Common:Editing}</PopupTitle>
+					<Url>~/Apps/Customization/Pages/LeftMenuItemEdit.aspx?FullId=[ClientParam:primaryKeyId]&amp;added=[ClientParam:added]</Url>
+					<Width>500</Width>
+					<Height>280</Height>
+					<Top>55</Top>
+					<Left>100</Left>
+					<Drag>True</Drag>
+					<EnableHandler type="Mediachase.Commerce.Manager.Apps.Core.CommandHandlers.Common.CommandHandlerBase, Mediachase.ConsoleManager" />
+				</Command>
+
+				<Command id="cmdCustomizationGridLeftMenuItemDelete">
+					<CommandType>ServerAction</CommandType>
+					<Handler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.LeftMenuItemDeleteHandler, Mediachase.ConsoleManager" />
+					<UpdatePanelIds>panelMainListView</UpdatePanelIds>
+					<EnableHandler type="Mediachase.Commerce.Manager.Apps.Customization.CommandHandlers.LeftMenuItemDeleteEnableHandler, Mediachase.ConsoleManager" />
+					<ConfirmationText>{Common:DeleteItemConfirmation}</ConfirmationText>
+				</Command>
+			</add>
+		</Commands>
+
+	</ListViewUI>
+	<ViewConfig>
+		<setAttributes id="LeftMenuItem-List" controlUrl="Customization/Modules/LeftMenuItems.ascx" />
+	</ViewConfig>
+</View>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/View/Navigation/LeftMenu.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/View/Navigation/LeftMenu.xml
new file mode 100644
index 00000000..f1829f3a
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Config/View/Navigation/LeftMenu.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<View xmlns="http://schemas.mediachase.com/ecf/view">
+	<Navigation>
+		<Tabs id="mainTag">
+			<Tab id="navTabAdmin">
+				<Link id="Core_System">
+					<add>
+						<Link order="60" id="LeftMenu" text="{Common:LeftMenu}" iconUrl="" iconCss="" command="cmd_LeftMenu" permissions="core:mng:leftmenu" />
+					</add>
+				</Link>
+			</Tab>
+		</Tabs>
+		<Commands>
+			<add>
+				<Command id="cmd_LeftMenu">
+					<CommandType>ClientAction</CommandType>
+					<ClientScript>CSManagementClient.ChangeView('Customization', 'LeftMenuItem-List')</ClientScript>
+					<EnableHandler type="Mediachase.Commerce.Manager.Apps.Core.CommandHandlers.Common.CommandHandlerBase, Mediachase.ConsoleManager" />
+				</Command>
+			</add>
+		</Commands>
+	</Navigation>
+</View>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/GridTemplates/LeftMenuItemActionsTemplate.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/GridTemplates/LeftMenuItemActionsTemplate.ascx
new file mode 100644
index 00000000..fd69f099
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/GridTemplates/LeftMenuItemActionsTemplate.ascx
@@ -0,0 +1 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItemActionsTemplate.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.GridTemplates.LeftMenuItemActionsTemplate" %>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Images/hide.gif b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Images/hide.gif
new file mode 100644
index 00000000..1b908cb9
Binary files /dev/null and b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Images/hide.gif differ
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Images/show.gif b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Images/show.gif
new file mode 100644
index 00000000..0d101e17
Binary files /dev/null and b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Images/show.gif differ
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/CustomPageEdit.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/CustomPageEdit.ascx
new file mode 100644
index 00000000..af106994
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/CustomPageEdit.ascx
@@ -0,0 +1,50 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="CustomPageEdit.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Modules.CustomPageEdit" %>
+<%@ Reference VirtualPath="~/Apps/Common/Design/BlockHeader2.ascx" %>
+<%@ Register TagPrefix="ibn" TagName="BlockHeader" src="~/Apps/Common/Design/BlockHeader2.ascx" %>
+<%@ Register TagPrefix="btn" namespace="Mediachase.BusinessFoundation" Assembly="Mediachase.BusinessFoundation" %>
+
+<table class="ibn-stylebox" cellspacing="0" cellpadding="0" width="100%" border="0" style="margin-top:1px">
+	<tr>
+		<td colspan="2"><ibn:blockheader id="MainHeader" runat="server"></ibn:blockheader></td>
+	</tr>
+	<tr>
+		<td valign="top">
+			<table class="text" cellspacing="7" cellpadding="0" border="0" style="table-layout:fixed;">
+				<tr>
+					<td class="ibn-label" style="width:150px;">
+						<asp:Literal runat="server" ID="TitleLiteral" Text="<%$ Resources: Global, _mc_Title %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="TitleText" Width="480"></asp:TextBox>
+						<asp:RequiredFieldValidator runat="server" ID="TitleTextRFValidator" ControlToValidate="TitleText" Display="Dynamic" ErrorMessage="*"></asp:RequiredFieldValidator>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label" valign="top">
+						<asp:Literal runat="server" ID="DescriptionLiteral" Text="<%$ Resources: Global, _mc_Description %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="DescriptionText" Width="480" TextMode="MultiLine" Rows="5"></asp:TextBox>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal runat="server" ID="TemplateLiteral" Text="<%$ Resources: Common, PageTemplate %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:DropDownList runat="server" ID="TemplateList" Width="480"></asp:DropDownList>
+					</td>
+				</tr>
+				<tr>
+					<td>&nbsp;</td>
+					<td style="padding-top:10px;">
+						<btn:imbutton class="text" id="SaveButton" style="width:110px;" 
+							Runat="server" onserverclick="SaveButton_ServerClick" />&nbsp;&nbsp;
+						<btn:imbutton class="text" id="CancelButton" style="width:110px;" 
+							Runat="server" IsDecline="true" CausesValidation="false" onserverclick="CancelButton_ServerClick"/>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/CustomPages.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/CustomPages.ascx
new file mode 100644
index 00000000..5a078a16
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/CustomPages.ascx
@@ -0,0 +1,30 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="CustomPages.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Modules.CustomPages" %>
+<%@ Reference Control="~/Apps/MetaUIEntity/Grid/EntityGrid.ascx" %>
+<%@ Reference Control="~/Apps/Core/Controls/MetaToolbar.ascx" %>
+<%@ Reference Control="~/Apps/MetaUIEntity/Grid/MetaGridServerEventAction.ascx" %>
+
+<%@ Register Src="~/Apps/MetaUIEntity/Grid/EntityGrid.ascx" TagName="Grid" TagPrefix="mc" %>
+<%@ Register Src="~/Apps/Core/Controls/MetaToolbar.ascx" TagName="Toolbar" TagPrefix="mc" %>
+<%@ Register Src="~/Apps/MetaUIEntity/Grid/MetaGridServerEventAction.ascx" TagName="GridEventAction" TagPrefix="mc" %>
+
+<script type="text/javascript">
+function LayoutResizeHandler(sender, eventArgs)
+{
+}
+</script>
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+	<tr>
+		<td style="padding-left:5px; padding-right:5px; padding-top:5px;">
+			<div class="noBottomBorder">
+				<mc:Toolbar runat="server" ID="ctrlToolbar" ClassName="CustomPage" ViewName="" PlaceName="PageList" ToolbarMode="ListViewUI" />
+			</div>		
+		</td>
+	</tr>
+	<tr>
+		<td style="padding-bottom:2px;">
+			<div style="margin-left:5px; margin-right:5px;">
+				<mc:Grid runat="server" ID="ctrlGrid" ShowPaging="false" DashboardMode="false" ClassName="CustomPage" ViewName="" PlaceName="PageList" />
+			</div>
+		</td>
+	</tr>
+</table>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemAdd.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemAdd.ascx
new file mode 100644
index 00000000..124650af
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemAdd.ascx
@@ -0,0 +1,139 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItemAdd.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Modules.LeftMenuItemAdd" %>
+<%@ Register TagPrefix="ibn" Assembly="Mediachase.BusinessFoundation" Namespace="Mediachase.BusinessFoundation" %>
+<%@ Register TagPrefix="mc" Namespace="Mediachase.FileUploader.Web.UI" Assembly = "Mediachase.FileUploader" %>
+<style type="text/css">
+#DataTable td
+{
+	padding:5px;
+}
+#DataTable td span.rightColumn
+{
+	display: none;
+}
+.rightColumn
+{
+	position: absolute;
+	right: 15px;
+	color: #666666!important;
+}
+.nodeCls, .x-panel-bwrap .x-panel-body
+{
+	position: relative;
+}
+* 
+{
+	zoom: 1;	
+}
+.MenuTree
+{
+	display: none;
+}
+.treeIcon
+{
+	width: 16px;
+	height: 16px;
+}
+</style>
+<script type="text/javascript">
+function SelectNode(node, args)
+{
+	var path = node.id;
+	var text = node.text;
+	while (node.parentNode && node.parentNode.id && node.parentNode.id != "FL_root_id")
+	{
+		node = node.parentNode;
+		path = node.id + "/" + path;
+	}
+	
+	var hiddenField = document.getElementById('<%= NodeIdField.ClientID%>');
+	if (hiddenField)
+		hiddenField.value = path;
+		
+	var selectedItemLabel = document.getElementById('<%= SelectedItemLabel.ClientID %>');
+	if (selectedItemLabel)
+	{
+		selectedItemLabel.innerHTML = text;
+		selectedItemLabel.className = "";
+	}
+}
+
+function InitMenuTree()
+{
+	var menuTree = $find('<%=MenuTree.ClientID%>');
+	if (menuTree && menuTree.extTreePanel)
+		menuTree.extTreePanel.on('click', SelectNode);
+}
+</script>
+<table cellspacing="0" cellpadding="0" border="0" width="100%" >
+	<tr>
+		<td style="width:300px; padding-left:8px;">
+			<div class="ibn-stylebox2" style="height:415px; position:relative; top:10px;bottom: 1px;">
+				<ibn:JsTreePanel FillToContainer="true" AutoScroll="true" id="MenuTree" runat="server" NodeTextCss="nodeCls" CssClass="MenuTree" IconCss="treeIcon"></ibn:JsTreePanel>
+			</div>
+		</td>
+		<td valign="top" style="padding-right:8px; padding-left:8px;">
+			<table cellpadding="0" cellspacing="3" width="100%" id="DataTable" style="table-layout: fixed;">
+				<tr>
+					<td class="ibn-label" style="width:120px;">
+						<asp:Literal ID="Literal1" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayRegion %>"></asp:Literal>:
+					</td>
+					<td style="width: 100%;"> 
+						<asp:Label runat="server" ID="SelectedItemLabel" Text="<%$ Resources: GlobalMetaInfo, ItemNotSelected %>" CssClass="ibn-error"></asp:Label>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label" valign="top">
+						<asp:Literal ID="Literal2" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayText %>"></asp:Literal>:
+					</td>
+					<td style="width: 100%;">
+						<asp:TextBox runat="server" ID="ItemText" Width="300"></asp:TextBox>
+						<asp:RequiredFieldValidator runat="server" ID="ItemTextRequiredValidator" ControlToValidate="ItemText" Display="static" ErrorMessage="*" Font-Bold="true"></asp:RequiredFieldValidator>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal4" runat="server" Text="<%$ Resources: GlobalMetaInfo, MenuItemLink %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="ItemUrl" Width="300"></asp:TextBox>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal3" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayOrder %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="ItemOrder" Width="300" Text="10000"></asp:TextBox>
+						<asp:RequiredFieldValidator runat="server" ID="ItemOrderRequiredValidator" ControlToValidate="ItemOrder" Display="dynamic" ErrorMessage="*" Font-Bold="true">
+						</asp:RequiredFieldValidator><asp:RangeValidator runat="server" ID="ItemOrderRangeValidator" ControlToValidate="ItemOrder" CultureInvariantValues="true" Type="Integer" MinimumValue="0" MaximumValue="999999" ErrorMessage="*" Display="dynamic" Font-Bold="true"></asp:RangeValidator>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal6" runat="server" Text="<%$ Resources: GlobalMetaInfo, Permissions %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="ItemPermissions" Width="300"></asp:TextBox>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal5" runat="server" Text="<%$ Resources: GlobalMetaInfo, MenuItemIcon %>"></asp:Literal>:
+					</td>
+					<td>
+						<mc:mchtmlinputfile id="fAssetFile" CssClass="text" runat="server" Width="300px" />
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2" align="center">
+						<br /><br /><br /><br />
+						<ibn:IMButton ID="PublishButton" runat="server" class="text" Text="<%$ Resources: Global, _mc_Add %>" OnServerClick="PublishButton_ServerClick" width="150px"/>
+						<br /><br />
+						<ibn:IMButton ID="CloseButton" runat="server" class="text" Text="<%$ Resources: Global, tClose %>" IsDecline="true" width="150px"/>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<asp:HiddenField runat="server" ID="NodeIdField" />
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemEdit.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemEdit.ascx
new file mode 100644
index 00000000..e760069e
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemEdit.ascx
@@ -0,0 +1,68 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItemEdit.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Modules.LeftMenuItemEdit" %>
+<%@ Register TagPrefix="ibn" Namespace="Mediachase.BusinessFoundation" Assembly="Mediachase.BusinessFoundation" %>
+<%@ Register TagPrefix="mc" Namespace="Mediachase.FileUploader.Web.UI" Assembly = "Mediachase.FileUploader" %>
+<table cellpadding="0" cellspacing="7" width="100%" style="table-layout: fixed;" border="0">
+	<tr>
+		<td class="ibn-label" valign="top">
+			<asp:Literal ID="Literal2" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayText %>"></asp:Literal>:
+		</td>
+		<td style="width:300px;">
+			<asp:TextBox runat="server" ID="ItemText" Width="280"></asp:TextBox>
+			<asp:RequiredFieldValidator runat="server" ID="ItemTextRequiredValidator" ControlToValidate="ItemText" Display="static" ErrorMessage="*" Font-Bold="true"></asp:RequiredFieldValidator>
+		</td>
+	</tr>
+	<tr runat="server" id="ItemUrlRow">
+		<td class="ibn-label">
+			<asp:Literal ID="ItemUrlLiteral" runat="server" Text="<%$ Resources: GlobalMetaInfo, MenuItemLink %>"></asp:Literal>:
+		</td>
+		<td>
+			<asp:TextBox runat="server" ID="ItemUrl" Width="280"></asp:TextBox>
+		</td>
+	</tr>
+	<tr>
+		<td class="ibn-label">
+			<asp:Literal ID="Literal3" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayOrder %>"></asp:Literal>:
+		</td>
+		<td>
+			<asp:TextBox runat="server" ID="ItemOrder" Width="280" Text="10000"></asp:TextBox>
+			<asp:RequiredFieldValidator runat="server" ID="ItemOrderRequiredValidator" ControlToValidate="ItemOrder" Display="dynamic" ErrorMessage="*" Font-Bold="true">
+			</asp:RequiredFieldValidator><asp:RangeValidator runat="server" ID="ItemOrderRangeValidator" ControlToValidate="ItemOrder" CultureInvariantValues="true" Type="Integer" MinimumValue="0" MaximumValue="999999" ErrorMessage="*" Display="dynamic" Font-Bold="true"></asp:RangeValidator>
+		</td>
+	</tr>
+	<tr>
+		<td class="ibn-label">
+			<asp:Literal ID="Literal6" runat="server" Text="<%$ Resources: GlobalMetaInfo, Permissions %>"></asp:Literal>:
+		</td>
+		<td>
+			<asp:TextBox runat="server" ID="ItemPermissions" Width="280"></asp:TextBox>
+		</td>
+	</tr>
+	<tr>
+		<td class="ibn-label" valign="top">
+			<asp:Literal ID="Literal5" runat="server" Text="<%$ Resources: GlobalMetaInfo, MenuItemIcon %>"></asp:Literal>:
+		</td>
+		<td>
+			<mc:mchtmlinputfile id="fAssetFile" CssClass="text" runat="server" Width="280px" />
+			
+			<table cellpadding="0" cellspacing="0">
+				<tr style="padding-top:10px">
+					<td align="center" valign="middle">
+						<div style="text-align:left;">
+							<img alt="" id="imgPhoto" runat="server" style="border-width:0;" src="" />
+						</div>
+					</td>
+					<td valign="top" style="padding-left:10px; width:25px">
+						<asp:LinkButton ID="DeleteButton" Runat="server" Visible="false" CausesValidation="False" onclick="DeleteButton_Click"></asp:LinkButton>
+					</td>
+				</tr>	
+			</table>
+		</td>
+	</tr>
+	<tr>
+	    <td align="right" style="padding-right:10px;" colspan="2">
+            <asp:Button runat="server" ID="SaveButton" Text="<%$ Resources:Common, btnOk %>" Width="80px" OnClick="SaveButton_ServerClick" />
+            &nbsp;&nbsp;&nbsp;
+            <asp:Button runat="server" ID="CancelButton" Text="<%$ Resources:Common, btnCancel %>" Width="80px" CausesValidation="false" />
+        </td>
+	</tr>
+</table>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemUpdate.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemUpdate.ascx
new file mode 100644
index 00000000..c4dff880
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItemUpdate.ascx
@@ -0,0 +1,61 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItemUpdate.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Modules.LeftMenuItemUpdate" %>
+<%@ Register TagPrefix="ibn" Namespace="Mediachase.BusinessFoundation" Assembly="Mediachase.BusinessFoundation" %>
+<%@ Register TagPrefix="mc" Namespace="Mediachase.FileUploader.Web.UI" Assembly = "Mediachase.FileUploader" %>
+<table cellpadding="0" cellspacing="7" width="100%" style="table-layout: fixed;">
+	<tr>
+		<td class="ibn-label" valign="top">
+			<asp:Literal ID="Literal2" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayText %>"></asp:Literal>:
+		</td>
+		<td style="width:300px;">
+			<asp:TextBox runat="server" ID="ItemText" Width="280"></asp:TextBox>
+			<asp:RequiredFieldValidator runat="server" ID="ItemTextRequiredValidator" ControlToValidate="ItemText" Display="static" ErrorMessage="*" Font-Bold="true"></asp:RequiredFieldValidator>
+		</td>
+	</tr>
+	<tr>
+		<td class="ibn-label">
+			<asp:Literal ID="Literal3" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayOrder %>"></asp:Literal>:
+		</td>
+		<td>
+			<asp:TextBox runat="server" ID="ItemOrder" Width="280" Text="10000"></asp:TextBox>
+			<asp:RequiredFieldValidator runat="server" ID="ItemOrderRequiredValidator" ControlToValidate="ItemOrder" Display="dynamic" ErrorMessage="*" Font-Bold="true">
+			</asp:RequiredFieldValidator><asp:RangeValidator runat="server" ID="ItemOrderRangeValidator" ControlToValidate="ItemOrder" CultureInvariantValues="true" Type="Integer" MinimumValue="0" MaximumValue="999999" ErrorMessage="*" Display="dynamic" Font-Bold="true"></asp:RangeValidator>
+		</td>
+	</tr>
+	<tr>
+		<td class="ibn-label">
+			<asp:Literal ID="Literal6" runat="server" Text="<%$ Resources: GlobalMetaInfo, Permissions %>"></asp:Literal>:
+		</td>
+		<td>
+			<asp:TextBox runat="server" ID="ItemPermissions" Width="280"></asp:TextBox>
+		</td>
+	</tr>
+	<tr>
+		<td class="ibn-label" valign="top">
+			<asp:Literal ID="Literal5" runat="server" Text="<%$ Resources: GlobalMetaInfo, MenuItemIcon %>"></asp:Literal>:
+		</td>
+		<td>
+			<mc:mchtmlinputfile id="fAssetFile" CssClass="text" runat="server" Width="280px" />
+			
+			<table cellpadding="0" cellspacing="0">
+				<tr style="padding-top:10px">
+					<td align="center" valign="middle">
+						<div style="text-align:left;">
+							<img alt="" id="imgPhoto" runat="server" style="border-width:0;" src="" />
+						</div>
+					</td>
+					<td valign="top" style="padding-left:10px; width:25px">
+						<asp:LinkButton ID="DeleteButton" Runat="server" Visible="false" CausesValidation="False" onclick="DeleteButton_Click"></asp:LinkButton>
+					</td>
+				</tr>	
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2" align="center">
+			<br />
+			<ibn:IMButton ID="SaveButton" runat="server" class="text" Text="<%$ Resources: Common, btnOk %>" OnServerClick="SaveButton_ServerClick" style="width:100px"/>
+			<br /><br />
+			<ibn:IMButton ID="CancelButton" runat="server" class="text" Text="<%$ Resources: Common, btnCancel %>" IsDecline="true" style="width:100px"/>
+		</td>
+	</tr>
+</table>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItems.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItems.ascx
new file mode 100644
index 00000000..912b4d1b
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/LeftMenuItems.ascx
@@ -0,0 +1,3 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItems.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Modules.LeftMenuItems" %>
+<%@ Register Src="../../Core/Controls/EcfListViewControl.ascx" TagName="EcfListViewControl" TagPrefix="core" %>
+<core:EcfListViewControl id="MyListView" runat="server" AppId="Customization" ViewId="LeftMenuItem-List" ShowTopToolbar="true"></core:EcfListViewControl>
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/Publish.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/Publish.ascx
new file mode 100644
index 00000000..cdafb137
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Modules/Publish.ascx
@@ -0,0 +1,136 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Publish.ascx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Modules.Publish" %>
+<%@ Register TagPrefix="ibn" Assembly="Mediachase.BusinessFoundation" Namespace="Mediachase.BusinessFoundation" %>
+<%@ Register TagPrefix="mc" Namespace="Mediachase.FileUploader.Web.UI" Assembly = "Mediachase.FileUploader" %>
+<style type="text/css">
+#DataTable td
+{
+	padding:5px;
+}
+#DataTable td span.rightColumn
+{
+	display: none;
+}
+.rightColumn
+{
+	position: absolute;
+	right: 15px;
+	color: #666666!important;
+}
+.nodeCls, .x-panel-bwrap .x-panel-body
+{
+	position: relative;
+}
+* 
+{
+	zoom: 1;	
+}
+.MenuTree
+{
+	display: none;
+}
+</style>
+<script type="text/javascript">
+function SelectNode(node, args)
+{
+	var path = node.id;
+	var text = node.text;
+	while (node.parentNode && node.parentNode.id && node.parentNode.id != "FL_root_id")
+	{
+		node = node.parentNode;
+		path = node.id + "/" + path;
+	}
+	
+	var hiddenField = document.getElementById('<%= NodeIdField.ClientID%>');
+	if (hiddenField)
+		hiddenField.value = path;
+		
+	var selectedItemLabel = document.getElementById('<%= SelectedItemLabel.ClientID %>');
+	if (selectedItemLabel)
+	{
+		selectedItemLabel.innerHTML = text;
+		selectedItemLabel.className = "";
+	}
+}
+
+function InitMenuTree()
+{
+	var menuTree = $find('<%=MenuTree.ClientID%>');
+	if (menuTree && menuTree.extTreePanel)
+		menuTree.extTreePanel.on('click', SelectNode);
+}
+</script>
+<table cellspacing="0" cellpadding="0" border="0" width="100%" style="margin-top:5px;">
+	<tr>
+		<td style="width:300px; padding-left:8px;">
+			<div class="ibn-stylebox2" style="height:415px; position:relative; top:1px;bottom: 1px;">
+				<ibn:JsTreePanel FillToContainer="true" AutoScroll="true" id="MenuTree" runat="server" IconCss="iconStdCls" NodeTextCss="nodeCls" CssClass="MenuTree"></ibn:JsTreePanel>				
+			</div>
+			
+		</td>
+		<td valign="top" style="padding-right:8px; padding-left:8px;">
+			<table cellpadding="0" cellspacing="3" width="100%" id="DataTable">
+				<tr>
+					<td class="ibn-label" style="width:120px;">
+						<asp:Literal ID="Literal1" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayRegion %>"></asp:Literal>:
+					</td>
+					<td> 
+						<asp:Label runat="server" ID="SelectedItemLabel" Text="<%$ Resources: GlobalMetaInfo, ItemNotSelected %>" CssClass="ibn-error"></asp:Label>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal2" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayText %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="ItemText" Width="280"></asp:TextBox>
+						<asp:RequiredFieldValidator runat="server" ID="ItemTextRequiredValidator" ControlToValidate="ItemText" Display="static" ErrorMessage="*" Font-Bold="true"></asp:RequiredFieldValidator>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal3" runat="server" Text="<%$ Resources: GlobalMetaInfo, DisplayOrder %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="ItemOrder" Width="280" Text="10000"></asp:TextBox>
+						<asp:RequiredFieldValidator runat="server" ID="ItemOrderRequiredValidator" ControlToValidate="ItemOrder" Display="dynamic" ErrorMessage="*" Font-Bold="true">
+						</asp:RequiredFieldValidator><asp:RangeValidator runat="server" ID="ItemOrderRangeValidator" ControlToValidate="ItemOrder" CultureInvariantValues="true" Type="Integer" MinimumValue="0" MaximumValue="999999" ErrorMessage="*" Display="dynamic" Font-Bold="true"></asp:RangeValidator>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal4" runat="server" Text="<%$ Resources: GlobalMetaInfo, ClientScript %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="ClientScript" Width="280"></asp:TextBox>
+						<asp:RequiredFieldValidator runat="server" ID="ClientScriptRequiredFieldValidator" ControlToValidate="ClientScript" Display="static" ErrorMessage="*" Font-Bold="true"></asp:RequiredFieldValidator>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal6" runat="server" Text="<%$ Resources: GlobalMetaInfo, Permissions %>"></asp:Literal>:
+					</td>
+					<td>
+						<asp:TextBox runat="server" ID="ItemPermissions" Width="280"></asp:TextBox>
+					</td>
+				</tr>
+				<tr>
+					<td class="ibn-label">
+						<asp:Literal ID="Literal5" runat="server" Text="<%$ Resources: GlobalMetaInfo, MenuItemIcon %>"></asp:Literal>:
+					</td>
+					<td>
+						<mc:mchtmlinputfile id="fAssetFile" CssClass="text" runat="server" Width="280px" />
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2" align="center">
+						<br /><br /><br /><br />
+						<ibn:IMButton ID="PublishButton" runat="server" class="text" Text="<%$ Resources: GlobalMetaInfo, Publish %>" OnServerClick="PublishButton_ServerClick" width="150px"/>
+						<br /><br />
+						<ibn:IMButton ID="CloseButton" runat="server" class="text" Text="<%$ Resources: GlobalMetaInfo, Close %>" IsDecline="true" width="150px"/>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<asp:HiddenField runat="server" ID="NodeIdField" />
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/CustomPageDesign.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/CustomPageDesign.aspx
new file mode 100644
index 00000000..b71cdb48
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/CustomPageDesign.aspx
@@ -0,0 +1,5 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CustomPageDesign.aspx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Pages.CustomPageDesign" MasterPageFile="~/Apps/MetaDataBase/MasterPages/ExtGrid.master"%>
+<%@ Register TagPrefix="mc" TagName="Module" Src="~/Apps/Customization/Modules/CustomPageDesign.ascx" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" Runat="Server">
+	<mc:Module ID="McModule" runat="server" />
+</asp:Content>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/CustomPageEdit.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/CustomPageEdit.aspx
new file mode 100644
index 00000000..c983ebb0
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/CustomPageEdit.aspx
@@ -0,0 +1,6 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CustomPageEdit.aspx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Pages.CustomPageEdit" MasterPageFile="~/Apps/MetaDataBase/MasterPages/ExtGrid.master" %>
+<%@ Register TagPrefix="mc" TagName="Module" Src="~/Apps/Customization/Modules/CustomPageEdit.ascx" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" Runat="Server">
+	<mc:Module ID="McModule" runat="server" />
+</asp:Content>
+
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemAdd.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemAdd.aspx
new file mode 100644
index 00000000..b45cdf14
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemAdd.aspx
@@ -0,0 +1,4 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItemAdd.aspx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Pages.LeftMenuItemAdd" %>
+<%@ Reference Control="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<%@ Register TagPrefix="ibn" TagName="PageTemplate" src="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<ibn:PageTemplate runat="server" id="pT" ControlName="~/Apps/Customization/Modules/LeftMenuItemAdd.ascx" Enctype="multipart/form-data" />
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemEdit.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemEdit.aspx
new file mode 100644
index 00000000..2126e44c
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemEdit.aspx
@@ -0,0 +1,4 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItemEdit.aspx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Pages.LeftMenuItemEdit" %>
+<%@ Reference Control="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<%@ Register TagPrefix="ibn" TagName="PageTemplate" src="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<ibn:PageTemplate runat="server" id="pT" ControlName="~/Apps/Customization/Modules/LeftMenuItemEdit.ascx" Enctype="multipart/form-data" />
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemUpdate.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemUpdate.aspx
new file mode 100644
index 00000000..c389f914
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/LeftMenuItemUpdate.aspx
@@ -0,0 +1,4 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LeftMenuItemUpdate.aspx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Pages.LeftMenuItemUpdate" %>
+<%@ Reference Control="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<%@ Register TagPrefix="ibn" TagName="PageTemplate" src="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<ibn:PageTemplate runat="server" id="pT" ControlName="~/Apps/Customization/Modules/LeftMenuItemUpdate.ascx" Enctype="multipart/form-data" />
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/Publish.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/Publish.aspx
new file mode 100644
index 00000000..301c6ca0
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Customization/Pages/Publish.aspx
@@ -0,0 +1,4 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Publish.aspx.cs" Inherits="Mediachase.Commerce.Manager.Apps.Customization.Pages.Publish" %>
+<%@ Reference Control="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<%@ Register TagPrefix="ibn" TagName="PageTemplate" src="~/Apps/MetaUIEntity/Layout/DialogTemplateNextNew.ascx" %>
+<ibn:PageTemplate runat="server" id="pT" ControlName="~/Apps/Customization/Modules/Publish.ascx" Enctype="multipart/form-data" />
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Order/Config/View/Forms/PaymentPlan-ObjectView.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Order/Config/View/Forms/PaymentPlan-ObjectView.xml
index a940503f..329d290c 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Order/Config/View/Forms/PaymentPlan-ObjectView.xml
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Order/Config/View/Forms/PaymentPlan-ObjectView.xml
@@ -208,7 +208,7 @@
     <Commands>
       <add>
         <Command id="btn_CancelOrderBtnPP">
-          <ConfirmationText>{OrderStrings:CancelOrderConfirmation}</ConfirmationText>
+          <ConfirmationText>{OrderStrings:CancelPaymentPlanConfirmation}</ConfirmationText>
           <CommandType>ServerAction</CommandType>
           <Handler type="Mediachase.Commerce.Manager.Order.CommandHandlers.PaymentPlanHandlers.CancelPaymentPlanHandler, Mediachase.ConsoleManager">
           </Handler>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Login.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Login.aspx
index dd3286f8..97e8a1a0 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Login.aspx
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Login.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="EPiServer.Reference.Commerce.Manager.Login" CodeBehind="~/Login.aspx.cs" %>
+<%@ Page Language="C#" AutoEventWireup="true" Inherits="Mediachase.Commerce.Manager.Login" CodeBehind="Login.aspx.cs" %>
 
 <%@ Import Namespace="Mediachase.Commerce.Shared" %>
 <script runat="server">
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Logout.aspx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Logout.aspx
index 9af4f3f2..b9aa1520 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Logout.aspx
+++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Logout.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="EPiServer.Reference.Commerce.Manager.Logout" CodeBehind="~/Logout.aspx.cs" %>
+<%@ Page Language="C#" AutoEventWireup="true" Inherits="Mediachase.Commerce.Manager.Logout" Codebehind="Logout.aspx.cs" %>
 <%@ Import Namespace="Mediachase.Commerce.Shared" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
index b499bd7a..a9dbf5ae 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
@@ -410,105 +410,105 @@
   </Target>
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.ConsoleManager, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.0\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.1\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ComponentArt.Web.UI, Version=2012.1.1016.35, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.0\lib\net461\ComponentArt.Web.UI.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.1\lib\net461\ComponentArt.Web.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="RssToolkit, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.0\lib\net461\RssToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.1\lib\net461\RssToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Validators, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.0\lib\net461\Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.11.8.1\lib\net461\Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-  <Import Project="..\..\packages\EPiServer.CommerceManager.11.8.0\build\EPiServer.CommerceManager.targets"
-    Condition="Exists('..\..\packages\EPiServer.CommerceManager.11.8.0\build\EPiServer.CommerceManager.targets')"/>
+  <Import Project="..\..\packages\EPiServer.CommerceManager.11.8.1\build\EPiServer.CommerceManager.targets"
+    Condition="Exists('..\..\packages\EPiServer.CommerceManager.11.8.1\build\EPiServer.CommerceManager.targets')"/>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.11.8.0\build\EPiServer.CommerceManager.targets')"
-      Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.11.8.0\build\EPiServer.CommerceManager.targets'))"/>
+    <Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.11.8.1\build\EPiServer.CommerceManager.targets')"
+      Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.11.8.1\build\EPiServer.CommerceManager.targets'))"/>
   </Target>
 </Project>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/packages.config b/Sources/EPiServer.Reference.Commerce.Manager/packages.config
index 1430c8c6..e5b5006d 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Manager/packages.config
@@ -46,6 +46,6 @@
   <package id="System.Security.Permissions" version="4.4.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
   <package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net461" />
-  <package id="EPiServer.Commerce.Core" version="11.8.0" targetFramework="net461"/>
-  <package id="EPiServer.CommerceManager" version="11.8.0" targetFramework="net461"/>
+  <package id="EPiServer.Commerce.Core" version="11.8.1" targetFramework="net461"/>
+  <package id="EPiServer.CommerceManager" version="11.8.1" targetFramework="net461"/>
 </packages>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/web.config b/Sources/EPiServer.Reference.Commerce.Manager/web.config
index 2087b913..fe999241 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/web.config
+++ b/Sources/EPiServer.Reference.Commerce.Manager/web.config
@@ -538,75 +538,75 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Business.Commerce" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation.Data" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Marketing.Validators" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Payment" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Shipping" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Website" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Workflow" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.DataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.FileUploader" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.MetaDataPlus" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.Extensions" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.LuceneSearchProvider" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.SqlDataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Internal.Migration" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.ConsoleManager" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj
index aa277806..91b8d5d9 100644
--- a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj
@@ -260,79 +260,79 @@
   -->
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Sources/EPiServer.Reference.Commerce.Shared/packages.config b/Sources/EPiServer.Reference.Commerce.Shared/packages.config
index d30f9d0a..fb471ec5 100644
--- a/Sources/EPiServer.Reference.Commerce.Shared/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Shared/packages.config
@@ -38,5 +38,5 @@
   <package id="System.Security.Permissions" version="4.4.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
   <package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net461" />
-  <package id="EPiServer.Commerce.Core" version="11.8.0" targetFramework="net461"/>
+  <package id="EPiServer.Commerce.Core" version="11.8.1" targetFramework="net461"/>
 </packages>
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj
index af22c84c..96081fc2 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj
@@ -383,87 +383,87 @@
   -->
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Tracking.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Tracking.Commerce.1.0.8\lib\net461\EPiServer.Tracking.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Tracking.Commerce.1.0.9\lib\net461\EPiServer.Tracking.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Personalization.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Personalization.Commerce.1.0.8\lib\net461\EPiServer.Personalization.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Personalization.Commerce.1.0.9\lib\net461\EPiServer.Personalization.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Checkout/ViewModelFactories/CheckoutViewModelFactoryTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Checkout/ViewModelFactories/CheckoutViewModelFactoryTests.cs
index e4692dab..d124ce1d 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Checkout/ViewModelFactories/CheckoutViewModelFactoryTests.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Checkout/ViewModelFactories/CheckoutViewModelFactoryTests.cs
@@ -2,7 +2,6 @@
 using EPiServer.Commerce.Order.Internal;
 using EPiServer.Core;
 using EPiServer.Framework.Localization;
-using EPiServer.Globalization;
 using EPiServer.Reference.Commerce.Site.Features.AddressBook.Services;
 using EPiServer.Reference.Commerce.Site.Features.Cart.ViewModelFactories;
 using EPiServer.Reference.Commerce.Site.Features.Cart.ViewModels;
@@ -63,16 +62,6 @@ public void CreateCheckoutViewModelWithPayment_ShouldReturnViewModelWithCorrectP
             Assert.Equal(viewModel.Payment.SystemKeyword, creditPaymentName);
         }
 
-        [Fact]
-        public void CreateCheckoutViewModel_WithNonePreferredAddress_ShouldSetDefaultBillingAddressToGuid()
-        {
-            var checkoutPage = new CheckoutPage();
-            _addressBookServiceMock.Setup(x => x.GetPreferredBillingAddress()).Returns((CustomerAddress)null);
-            var viewModel = _subject.CreateCheckoutViewModel(_cart, checkoutPage);
-
-            Assert.IsType(typeof(Guid), Guid.Parse(viewModel.BillingAddress.Name));
-        }
-
         [Fact]
         public void CreateCheckoutViewModel_WhenCartIsNull_ShouldReturnEmptyViewModel()
         {
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs
index 52865419..22159822 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Product/Controllers/ProductControllerTests.cs
@@ -56,7 +56,7 @@ public async void Index_WhenSkipTrackingIsTrue_ShouldNotSendTracking()
 
             await CreateController().Index(fashionProduct, "notexist", false, true);
 
-            _recommendationServiceMock.Verify(x => x.TrackProduct(It.IsAny<HttpContextBase>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+            _recommendationServiceMock.Verify(x => x.TrackProductAsync(It.IsAny<HttpContextBase>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
         }
 
         [Fact]
@@ -69,7 +69,7 @@ public async void Index_WhenQuickViewIsTrue_And_SkipTrackingIsFalse_ShouldSendTr
 
             await CreateController().Index(fashionProduct, "notexist", true, false);
 
-            _recommendationServiceMock.Verify(x => x.TrackProduct(It.IsAny<HttpContextBase>(), It.IsAny<string>(), true), Times.Once);
+            _recommendationServiceMock.Verify(x => x.TrackProductAsync(It.IsAny<HttpContextBase>(), It.IsAny<string>(), true), Times.Once);
         }
 
         [Fact]
@@ -82,7 +82,7 @@ public async void Index_WhenQuickViewIsTrue_And_SkipTrackingIsTrue_ShouldNotSend
 
             await CreateController().Index(fashionProduct, "notexist", true, true);
 
-            _recommendationServiceMock.Verify(x => x.TrackProduct(It.IsAny<HttpContextBase>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+            _recommendationServiceMock.Verify(x => x.TrackProductAsync(It.IsAny<HttpContextBase>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
         }
 
         [Fact]
@@ -95,7 +95,7 @@ public async void Index_WhenQuickViewIsFalse_ShouldSendTrackingWithRetrieveRecom
 
             await CreateController().Index(fashionProduct, "notexist", false, false);
 
-            _recommendationServiceMock.Verify(x => x.TrackProduct(It.IsAny<HttpContextBase>(), It.IsAny<string>(), false), Times.Once);
+            _recommendationServiceMock.Verify(x => x.TrackProductAsync(It.IsAny<HttpContextBase>(), It.IsAny<string>(), false), Times.Once);
         }
 
         [Fact]
@@ -155,7 +155,7 @@ public ProductControllerTests()
             _viewModelFactoryMock = new Mock<CatalogEntryViewModelFactory>(null, null, null, null);
             _recommendationServiceMock = new Mock<IRecommendationService>();
             _recommendationServiceMock
-                .Setup(m => m.TrackProduct(It.IsAny<HttpContextBase>(), It.IsAny<string>(), It.IsAny<bool>()))
+                .Setup(m => m.TrackProductAsync(It.IsAny<HttpContextBase>(), It.IsAny<string>(), It.IsAny<bool>()))
                 .ReturnsAsync((TrackingResponseData) null);
 
             _referenceConverterMock = new Mock<ReferenceConverter>(null, null);
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs
index 10199086..92590efa 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs
@@ -34,7 +34,7 @@ public async void Index_WhenBrowsingFirstResultPage_ShouldSendSearchTracking()
         {
             await _subject.Index(new SearchPage(), new FilterOptionViewModel() { Page = 1 });
             _recommendationServiceMock.Verify(
-               x => x.TrackSearch(
+               x => x.TrackSearchAsync(
                        It.IsAny<HttpContextBase>(),
                        It.IsAny<string>(),
                        It.Is<IEnumerable<string>>(y => y.Single() == _searchViewModel.ProductViewModels.Single().Code)
@@ -55,7 +55,7 @@ public async void Index_WhenBrowsingNextResultPage_ShouldNotSendSearchTracking()
         {
             await _subject.Index(new SearchPage(), new FilterOptionViewModel() { Page = 2 });
             _recommendationServiceMock.Verify(
-               x => x.TrackSearch(
+               x => x.TrackSearchAsync(
                        It.IsAny<HttpContextBase>(),
                        It.IsAny<string>(),
                        It.IsAny<IEnumerable<string>>()
@@ -70,7 +70,7 @@ public async void Index_WhenUsingFacetFiltersInFirstResultPage_ShouldNotSendSear
 
             await _subject.Index(new SearchPage(), new FilterOptionViewModel() { Page = 1 });
             _recommendationServiceMock.Verify(
-               x => x.TrackSearch(
+               x => x.TrackSearchAsync(
                        It.IsAny<HttpContextBase>(),
                        It.IsAny<string>(),
                        It.IsAny<IEnumerable<string>>()
@@ -99,7 +99,7 @@ public void QuickSearch_WhenSearch_ShouldNotSendSearchTracking()
         {
             var result = ((ViewResult)_subject.QuickSearch("test")).Model as ProductTileViewModel[];           
             _recommendationServiceMock.Verify(
-                x => x.TrackSearch(
+                x => x.TrackSearchAsync(
                     It.IsAny<HttpContextBase>(),
                     It.IsAny<string>(),
                     It.IsAny<IEnumerable<string>>()),
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config
index add8ef8c..dca9c35e 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config
@@ -51,7 +51,7 @@
   <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net461" />
   <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net461" />
   <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net461" developmentDependency="true" />
-  <package id="EPiServer.Commerce.Core" version="11.8.0" targetFramework="net461"/>
-  <package id="EPiServer.Tracking.Commerce" version="1.0.8" targetFramework="net461"/>
-  <package id="EPiServer.Personalization.Commerce" version="1.0.8" targetFramework="net461"/>
+  <package id="EPiServer.Commerce.Core" version="11.8.1" targetFramework="net461"/>
+  <package id="EPiServer.Tracking.Commerce" version="1.0.9" targetFramework="net461"/>
+  <package id="EPiServer.Personalization.Commerce" version="1.0.9" targetFramework="net461"/>
 </packages>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj
index 27e2f6b9..a4f3aa3e 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj
@@ -388,6 +388,7 @@
     <Compile Include="Features\Checkout\ViewModelFactories\OrderSummaryViewModelFactory.cs" />
     <Compile Include="Features\Checkout\Services\ShippingManagerFacade.cs" />
     <Compile Include="Features\Checkout\Models\ShippingMethodInfoModel.cs" />
+    <Compile Include="Features\Checkout\ViewModels\ShipmentConfirmationViewModel.cs" />
     <Compile Include="Features\Checkout\ViewModels\UpdateAddressViewModel.cs" />
     <Compile Include="Features\Checkout\ViewModels\UpdateShippingMethodViewModel.cs" />
     <Compile Include="Features\Market\Models\EmptyMarket.cs" />
@@ -996,99 +997,99 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Shell, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.UI.11.8.0\lib\net461\EPiServer.Commerce.Shell.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.UI.11.8.1\lib\net461\EPiServer.Commerce.Shell.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Shell.ManagerIntegration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.11.8.0\lib\net461\EPiServer.Commerce.Shell.ManagerIntegration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.11.8.1\lib\net461\EPiServer.Commerce.Shell.ManagerIntegration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.UI, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.UI.11.8.0\lib\net461\EPiServer.Commerce.UI.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.UI.11.8.1\lib\net461\EPiServer.Commerce.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Tracking.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Tracking.Commerce.1.0.8\lib\net461\EPiServer.Tracking.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Tracking.Commerce.1.0.9\lib\net461\EPiServer.Tracking.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Personalization.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Personalization.Commerce.1.0.8\lib\net461\EPiServer.Personalization.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Personalization.Commerce.1.0.9\lib\net461\EPiServer.Personalization.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.0\lib\net461\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.11.8.1\lib\net461\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/CartController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/CartController.cs
index 4da8f978..cd73a9d5 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/CartController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/CartController.cs
@@ -60,7 +60,7 @@ public async Task<ActionResult> AddToCart(string code)
             if (result.EntriesAddedToCart)
             {
                 _orderRepository.Save(Cart);
-                await _recommendationService.TrackCart(HttpContext);
+                await _recommendationService.TrackCartAsync(HttpContext);
                 return MiniCartDetails();
             }
             
@@ -75,7 +75,7 @@ public async Task<ActionResult> ChangeCartItem(int shipmentId, string code, deci
 
             _cartService.ChangeCartItem(Cart, shipmentId, code, quantity, size, newSize);
             _orderRepository.Save(Cart);
-            await _recommendationService.TrackCart(HttpContext);
+            await _recommendationService.TrackCartAsync(HttpContext);
             return MiniCartDetails();
         }
 
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/WishListController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/WishListController.cs
index 82cff76e..a8d41c2b 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/WishListController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Cart/Controllers/WishListController.cs
@@ -76,7 +76,7 @@ public async Task<ActionResult> AddToCart(string code)
             if (result.EntriesAddedToCart)
             {
                 _orderRepository.Save(WishList);
-                await _recommendationService.TrackWishlist(HttpContext);
+                await _recommendationService.TrackWishlistAsync(HttpContext);
                 return WishListMiniCartDetails();
             }
 
@@ -91,7 +91,7 @@ public async Task<ActionResult> ChangeCartItem(string code, decimal quantity, st
 
             _cartService.ChangeCartItem(WishList, 0, code, quantity, size, newSize);
             _orderRepository.Save(WishList);
-            await _recommendationService.TrackWishlist(HttpContext);
+            await _recommendationService.TrackWishlistAsync(HttpContext);
             return WishListMiniCartDetails();
         }
 
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/CheckoutController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/CheckoutController.cs
index b9929e2b..91bb55b1 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/CheckoutController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/CheckoutController.cs
@@ -69,7 +69,7 @@ public async Task<ActionResult> Index(CheckoutPage currentPage)
             _cartService.ApplyDiscounts(Cart);
             _orderRepository.Save(Cart);
 
-            await _recommendationService.TrackCheckout(HttpContext);
+            await _recommendationService.TrackCheckoutAsync(HttpContext);
 
             _checkoutService.ProcessPaymentCancel(viewModel, TempData, ControllerContext);
 
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationController.cs
index 2d1c4e56..96115ad0 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationController.cs
@@ -33,19 +33,19 @@ public async Task<ActionResult> Index(OrderConfirmationPage currentPage, string
             IPurchaseOrder order = null;
             if (PageEditing.PageIsInEditMode)
             {
-                order = _confirmationService.CreateFakePurchaseOrder();
+                order = ConfirmationService.CreateFakePurchaseOrder();
             }
             else if (orderNumber.HasValue)
             {
-                order = _confirmationService.GetOrder(orderNumber.Value);
+                order = ConfirmationService.GetOrder(orderNumber.Value);
 
                 if (order != null)
                 {
-                    await _recommendationService.TrackOrder(HttpContext, order);
+                    await _recommendationService.TrackOrderAsync(HttpContext, order);
                 }
             }
 
-            if (order != null && order.CustomerId == _customerContext.CurrentContactId)
+            if (order != null && order.CustomerId == CustomerContext.CurrentContactId)
             {
                 var viewModel = CreateViewModel(currentPage, order);
                 viewModel.NotificationMessage = notificationMessage;
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationControllerBase.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationControllerBase.cs
index 5b14b709..3931db93 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationControllerBase.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationControllerBase.cs
@@ -8,52 +8,50 @@
 using EPiServer.Web.Mvc;
 using System.Collections.Generic;
 using System.Linq;
+using EPiServer.Reference.Commerce.Site.Features.Market.Services;
+using Mediachase.Commerce;
+using Mediachase.Commerce.Markets;
 using Mediachase.Commerce.Orders;
 
 namespace EPiServer.Reference.Commerce.Site.Features.Checkout.Controllers
 {
     public abstract class OrderConfirmationControllerBase<T> : PageController<T> where T : PageData
     {
-        protected readonly ConfirmationService _confirmationService;
+        protected readonly ConfirmationService ConfirmationService;
+        protected readonly CustomerContextFacade CustomerContext;
         private readonly AddressBookService _addressBookService;
-        protected readonly CustomerContextFacade _customerContext;
         private readonly IOrderGroupTotalsCalculator _orderGroupTotalsCalculator;
-
+       
         protected OrderConfirmationControllerBase(
             ConfirmationService confirmationService,
             AddressBookService addressBookService,
             CustomerContextFacade customerContextFacade,
             IOrderGroupTotalsCalculator orderGroupTotalsCalculator)
         {
-            _confirmationService = confirmationService;
+            ConfirmationService = confirmationService;
             _addressBookService = addressBookService;
-            _customerContext = customerContextFacade;
+            CustomerContext = customerContextFacade;
             _orderGroupTotalsCalculator = orderGroupTotalsCalculator;
         }
 
         protected OrderConfirmationViewModel<T> CreateViewModel(T currentPage, IPurchaseOrder order)
         {
-            var hasOrder = order != null;
-
-            if (!hasOrder)
+            if (order == null)
             {
                 return new OrderConfirmationViewModel<T> { CurrentPage = currentPage };
             }
 
-            var lineItems = order.GetFirstForm().Shipments.SelectMany(x => x.LineItems);
             var totals = _orderGroupTotalsCalculator.GetTotals(order);
 
-            var viewModel = new OrderConfirmationViewModel<T>
+            return new OrderConfirmationViewModel<T>
             {
                 Currency = order.Currency,
                 CurrentPage = currentPage,
-                HasOrder = hasOrder,
+                HasOrder = true,
                 OrderId = order.OrderNumber,
                 Created = order.Created,
-                Items = lineItems,
-                BillingAddress = new AddressModel(),
-                ShippingAddresses = new List<AddressModel>(),
-                ContactId = _customerContext.CurrentContactId,
+                BillingAddress = _addressBookService.ConvertToModel(order.GetFirstForm().Payments.First().BillingAddress),
+                ContactId = CustomerContext.CurrentContactId,
                 Payments = order.GetFirstForm().Payments.Where(c => c.TransactionType == TransactionType.Authorization.ToString() || c.TransactionType == TransactionType.Sale.ToString()),
                 OrderGroupId = order.OrderLink.OrderGroupId,
                 OrderLevelDiscountTotal = order.GetOrderDiscountTotal(order.Currency),
@@ -62,23 +60,17 @@ protected OrderConfirmationViewModel<T> CreateViewModel(T currentPage, IPurchase
                 ShippingTotal = totals.ShippingTotal,
                 HandlingTotal = totals.HandlingTotal,
                 TaxTotal = totals.TaxTotal,
-                CartTotal = totals.Total
+                CartTotal = totals.Total,
+                Shipments = order.Forms.SelectMany(x => x.Shipments).Select(x => new ShipmentConfirmationViewModel
+                {
+                    Address = _addressBookService.ConvertToModel(x.ShippingAddress),
+                    LineItems = x.LineItems,
+                    ShipmentCost = x.GetShippingCost(order.Market, order.Currency),
+                    DiscountPrice = x.GetShipmentDiscountPrice(order.Currency),
+                    ShippingItemsTotal = x.GetShippingItemsTotal(order.Currency),
+                    ShippingMethodName = x.ShippingMethodName,
+                })
             };
-
-            var billingAddress = order.GetFirstForm().Payments.First().BillingAddress;
-
-            // Map the billing address using the billing id of the order form.
-            _addressBookService.MapToModel(billingAddress, viewModel.BillingAddress);
-
-            // Map the remaining addresses as shipping addresses.
-            foreach (var orderAddress in order.Forms.SelectMany(x => x.Shipments).Select(s => s.ShippingAddress))
-            {
-                var shippingAddress = new AddressModel();
-                _addressBookService.MapToModel(orderAddress, shippingAddress);
-                viewModel.ShippingAddresses.Add(shippingAddress);
-            }
-
-            return viewModel;
         }
     }
 }
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationMailPageController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationMailPageController.cs
index a961e09e..6d694fc1 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationMailPageController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Controllers/OrderConfirmationMailPageController.cs
@@ -27,11 +27,11 @@ public ActionResult Index(OrderConfirmationMailPage currentPage, int? orderNumbe
             IPurchaseOrder order;
             if (PageEditing.PageIsInEditMode)
             {
-                order = _confirmationService.CreateFakePurchaseOrder();
+                order = ConfirmationService.CreateFakePurchaseOrder();
             }
             else
             {
-                order = _confirmationService.GetOrder(orderNumber.Value);
+                order = ConfirmationService.GetOrder(orderNumber.Value);
                 if (order == null)
                 {
                     return Redirect(Url.ContentUrl(ContentReference.StartPage));
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModelFactories/CheckoutViewModelFactory.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModelFactories/CheckoutViewModelFactory.cs
index 65922832..518ac28a 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModelFactories/CheckoutViewModelFactory.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModelFactories/CheckoutViewModelFactory.cs
@@ -158,11 +158,12 @@ private void UpdatePayment(CheckoutViewModel viewModel)
         private AddressModel CreateBillingAddressModel()
         {
             var preferredBillingAddress = _addressBookService.GetPreferredBillingAddress();
+            var addressId = preferredBillingAddress?.Name ?? Guid.NewGuid().ToString();
 
             return new AddressModel
             {
-                AddressId = preferredBillingAddress?.Name,
-                Name = preferredBillingAddress != null ? preferredBillingAddress.Name : Guid.NewGuid().ToString(),
+                AddressId = addressId,
+                Name = addressId
             };
         }
 
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModels/OrderConfirmationViewModel.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModels/OrderConfirmationViewModel.cs
index b617cceb..e3976374 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModels/OrderConfirmationViewModel.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModels/OrderConfirmationViewModel.cs
@@ -12,9 +12,7 @@ public class OrderConfirmationViewModel<T> : PageViewModel<T> where T : PageData
     {
         public bool HasOrder { get; set; }
         public string OrderId { get; set; }
-        public IEnumerable<ILineItem> Items { get; set; }
         public AddressModel BillingAddress { get; set; }
-        public IList<AddressModel> ShippingAddresses { get; set; }
         public IEnumerable<IPayment> Payments { get; set; }
         public Guid ContactId { get; set; }
         public DateTime Created { get; set; }
@@ -28,5 +26,6 @@ public class OrderConfirmationViewModel<T> : PageViewModel<T> where T : PageData
         public Money TaxTotal { get; set; }
         public Money CartTotal { get; set; }
         public Money OrderLevelDiscountTotal { get; set; }
+        public IEnumerable<ShipmentConfirmationViewModel> Shipments { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModels/ShipmentConfirmationViewModel.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModels/ShipmentConfirmationViewModel.cs
new file mode 100644
index 00000000..507cf13c
--- /dev/null
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/ViewModels/ShipmentConfirmationViewModel.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using EPiServer.Commerce.Order;
+using EPiServer.Reference.Commerce.Site.Features.Shared.Models;
+using Mediachase.Commerce;
+
+namespace EPiServer.Reference.Commerce.Site.Features.Checkout.ViewModels
+{
+    public class ShipmentConfirmationViewModel
+    {
+        public IEnumerable<ILineItem> LineItems { get; set; }
+        public Money ShipmentCost { get; set; }
+        public AddressModel Address { get; set; }
+        public Money DiscountPrice { get; set; }
+        public Money ShippingItemsTotal { get; set; }
+        public string ShippingMethodName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/BundleController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/BundleController.cs
index 096d2ddf..9081932c 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/BundleController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/BundleController.cs
@@ -39,7 +39,7 @@ public async Task<ActionResult> Index(FashionBundle currentContent, bool useQuic
                 return Request.IsAjaxRequest() ? PartialView(emptyViewName, viewModel) : (ActionResult)View(emptyViewName, viewModel);
             }
 
-            var trackingResults = await _recommendationService.TrackProduct(HttpContext, currentContent.Code, useQuickview);
+            var trackingResults = await _recommendationService.TrackProductAsync(HttpContext, currentContent.Code, useQuickview);
 
             if (useQuickview)
             {
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/PackageController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/PackageController.cs
index 78e6323f..6cb27b33 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/PackageController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/PackageController.cs
@@ -38,7 +38,7 @@ public async Task<ActionResult> Index(FashionPackage currentContent, bool useQui
                 return Request.IsAjaxRequest() ? PartialView(emptyViewName, viewModel) : (ActionResult)View(emptyViewName, viewModel);
             }
 
-            var trackingResults = await _recommendationService.TrackProduct(HttpContext, currentContent.Code, useQuickview);
+            var trackingResults = await _recommendationService.TrackProductAsync(HttpContext, currentContent.Code, useQuickview);
 
             if (useQuickview)
             {
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs
index 2025237f..1dd30b01 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Product/Controllers/ProductController.cs
@@ -46,7 +46,7 @@ public async Task<ActionResult> Index(FashionProduct currentContent, string entr
             {
                 if (!skipTracking)
                 {
-                    await _recommendationService.TrackProduct(HttpContext, currentContent.Code, true);
+                    await _recommendationService.TrackProductAsync(HttpContext, currentContent.Code, true);
                 }
 
                 return PartialView("_Quickview", viewModel);
@@ -54,7 +54,7 @@ public async Task<ActionResult> Index(FashionProduct currentContent, string entr
 
             if (!skipTracking)
             {
-                var trackingResult = await _recommendationService.TrackProduct(HttpContext, currentContent.Code, false);
+                var trackingResult = await _recommendationService.TrackProductAsync(HttpContext, currentContent.Code, false);
 
                 viewModel.AlternativeProducts =
                     trackingResult?.GetAlternativeProductsRecommendations(_referenceConverter).Take(3);
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/IRecommendationService.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/IRecommendationService.cs
index 72c97bcd..4a08837c 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/IRecommendationService.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/IRecommendationService.cs
@@ -11,13 +11,13 @@ namespace EPiServer.Reference.Commerce.Site.Features.Recommendations.Services
 {
     public interface IRecommendationService
     {
-        Task<TrackingResponseData> TrackProduct(HttpContextBase httpContext, string productCode, bool skipRecommendations);
-        Task<TrackingResponseData> TrackSearch(HttpContextBase httpContext, string searchTerm, IEnumerable<string> productCodes);
-        Task<TrackingResponseData> TrackOrder(HttpContextBase httpContext, IPurchaseOrder order);
-        Task<TrackingResponseData> TrackCategory(HttpContextBase httpContext, NodeContent category);
-        Task<TrackingResponseData> TrackCart(HttpContextBase httpContext);
-        Task<TrackingResponseData> TrackWishlist(HttpContextBase httpContext);
-        Task<TrackingResponseData> TrackCheckout(HttpContextBase httpContext);
+        Task<TrackingResponseData> TrackProductAsync(HttpContextBase httpContext, string productCode, bool skipRecommendations);
+        Task<TrackingResponseData> TrackSearchAsync(HttpContextBase httpContext, string searchTerm, IEnumerable<string> productCodes);
+        Task<TrackingResponseData> TrackOrderAsync(HttpContextBase httpContext, IPurchaseOrder order);
+        Task<TrackingResponseData> TrackCategoryAsync(HttpContextBase httpContext, NodeContent category);
+        Task<TrackingResponseData> TrackCartAsync(HttpContextBase httpContext);
+        Task<TrackingResponseData> TrackWishlistAsync(HttpContextBase httpContext);
+        Task<TrackingResponseData> TrackCheckoutAsync(HttpContextBase httpContext);
 
         IEnumerable<RecommendedProductTileViewModel> GetRecommendedProductTileViewModels(IEnumerable<Recommendation> recommendations);
     }
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/RecommendationService.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/RecommendationService.cs
index 55dab887..416a1e2e 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/RecommendationService.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Recommendations/Services/RecommendationService.cs
@@ -39,7 +39,7 @@ public RecommendationService(
             _trackingService = trackingService;
         }
 
-        public async Task<TrackingResponseData> TrackProduct(HttpContextBase httpContext, string productCode, bool skipRecommendations)
+        public async Task<TrackingResponseData> TrackProductAsync(HttpContextBase httpContext, string productCode, bool skipRecommendations)
         {
             if (_contextModeResolver.CurrentMode != ContextMode.Default)
             {
@@ -56,7 +56,7 @@ public async Task<TrackingResponseData> TrackProduct(HttpContextBase httpContext
             return await _trackingService.TrackAsync(trackingData, httpContext, _contentRouteHelperAccessor().Content);
         }
 
-        public async Task<TrackingResponseData> TrackSearch(HttpContextBase httpContext, string searchTerm, IEnumerable<string> productCodes)
+        public async Task<TrackingResponseData> TrackSearchAsync(HttpContextBase httpContext, string searchTerm, IEnumerable<string> productCodes)
         {
             if (_contextModeResolver.CurrentMode != ContextMode.Default || string.IsNullOrWhiteSpace(searchTerm))
             {
@@ -67,7 +67,7 @@ public async Task<TrackingResponseData> TrackSearch(HttpContextBase httpContext,
             return await _trackingService.TrackAsync(trackingData, httpContext, _contentRouteHelperAccessor().Content);
         }
 
-        public async Task<TrackingResponseData> TrackOrder(HttpContextBase httpContext, IPurchaseOrder order)
+        public async Task<TrackingResponseData> TrackOrderAsync(HttpContextBase httpContext, IPurchaseOrder order)
         {
             if (_contextModeResolver.CurrentMode != ContextMode.Default)
             {
@@ -78,7 +78,7 @@ public async Task<TrackingResponseData> TrackOrder(HttpContextBase httpContext,
             return await _trackingService.TrackAsync(trackingData, httpContext, _contentRouteHelperAccessor().Content);
         }
 
-        public async Task<TrackingResponseData> TrackCategory(HttpContextBase httpContext, NodeContent category)
+        public async Task<TrackingResponseData> TrackCategoryAsync(HttpContextBase httpContext, NodeContent category)
         {
             if (_contextModeResolver.CurrentMode != ContextMode.Default)
             {
@@ -89,7 +89,7 @@ public async Task<TrackingResponseData> TrackCategory(HttpContextBase httpContex
             return await _trackingService.TrackAsync(trackingData, httpContext, _contentRouteHelperAccessor().Content);
         }
 
-        public async Task<TrackingResponseData> TrackCart(HttpContextBase httpContext)
+        public async Task<TrackingResponseData> TrackCartAsync(HttpContextBase httpContext)
         {
             if (_contextModeResolver.CurrentMode != ContextMode.Default)
             {
@@ -101,7 +101,7 @@ public async Task<TrackingResponseData> TrackCart(HttpContextBase httpContext)
             return await _trackingService.TrackAsync(trackingData, httpContext, _contentRouteHelperAccessor().Content);
         }
 
-        public async Task<TrackingResponseData> TrackWishlist(HttpContextBase httpContext)
+        public async Task<TrackingResponseData> TrackWishlistAsync(HttpContextBase httpContext)
         {
             if (_contextModeResolver.CurrentMode != ContextMode.Default)
             {
@@ -112,7 +112,7 @@ public async Task<TrackingResponseData> TrackWishlist(HttpContextBase httpContex
             return await _trackingService.TrackAsync(trackingData, httpContext, _contentRouteHelperAccessor().Content);
         }
 
-        public async Task<TrackingResponseData> TrackCheckout(HttpContextBase httpContext)
+        public async Task<TrackingResponseData> TrackCheckoutAsync(HttpContextBase httpContext)
         {
             if (_contextModeResolver.CurrentMode != ContextMode.Default)
             {
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs
index b718857c..367bfe24 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs
@@ -33,7 +33,7 @@ public async Task<ViewResult> Index(FashionNode currentContent, FilterOptionView
 
             if (HttpContext.Request.HttpMethod == "GET")
             {
-                var trackingResult = await _recommendationService.TrackCategory(HttpContext, currentContent);
+                var trackingResult = await _recommendationService.TrackCategoryAsync(HttpContext, currentContent);
                 model.Recommendations = trackingResult.GetCategoryRecommendations(_referenceConverter);
             }
 
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs
index 9c41c781..6fd29de1 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs
@@ -43,7 +43,7 @@ public async Task<ActionResult> Index(SearchPage currentPage, FilterOptionViewMo
                 HttpContext.Items[SearchTrackingData.TotalSearchResultsKey] = filterOptions.TotalCount;
 
                 var trackingResult =
-                    await _recommendationService.TrackSearch(HttpContext, filterOptions.Q,
+                    await _recommendationService.TrackSearchAsync(HttpContext, filterOptions.Q,
                         viewModel.ProductViewModels.Select(x => x.Code));
                 viewModel.Recommendations = trackingResult.GetSearchResultRecommendations(_referenceConverter);
             }
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmation/Index.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmation/Index.cshtml
index cfbafd50..640e494a 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmation/Index.cshtml
+++ b/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmation/Index.cshtml
@@ -22,52 +22,91 @@
 <div class="row checkout">
 
     <div class="col-md-12">
-        @Html.PropertyFor(x => x.CurrentPage.Body)
 
         @if (Model.HasOrder)
         {
-            <div class="row hidden-xs hidden-sm">
-                <div class="col-md-7">@Html.Translate("/OrderConfirmation/Labels/Product")</div>
-                <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmation/Labels/Quantity")</div>
-                <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmationMail/UnitPrice")</div>
-                <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmationMail/Price")</div>
-                <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmationMail/Discount")</div>
-                <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmation/Labels/Total")</div>
-            </div>
-
-            foreach (ILineItem lineItem in Model.Items)
+            foreach (var shipment in Model.Shipments)
             {
-                <hr />
-                <div class="row">
-                    <div class="col-md-1 col-xs-3">
-                        <a href="@lineItem.GetUrl()" class="link--black"><img src="@lineItem.GetThumbnailUrl()" /></a>
-                    </div>
-                    <div class="col-md-6 col-xs-9">
-                        <a href="@lineItem.GetUrl()" class="link--black">@lineItem.GetEntryContent().DisplayName</a>
-                    </div>
-                    <div class="col-md-1 col-xs-12 text-right">
-                        <label class="col-xs-8 visible-xs visible-sm">@Html.Translate("/OrderConfirmation/Labels/Quantity")</label>
-                        @lineItem.Quantity.ToString("0")
-                    </div>
-                    <div class="col-md-1 col-xs-12 text-right">
-                        <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmationMail/UnitPrice")</label>
-                        @Helpers.RenderMoney(lineItem.PlacedPrice, Model.Currency)
-                    </div>
-                    <div class="col-md-1 col-xs-12 text-right">
-                        <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmationMail/Price")</label>
-                        @Helpers.RenderMoney(lineItem.PlacedPrice * lineItem.Quantity, Model.Currency)
+                <div class="row hidden-xs hidden-sm">
+                    <div class="col-md-7">@Html.Translate("/OrderConfirmation/Labels/Product")</div>
+                    <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmation/Labels/Quantity")</div>
+                    <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmationMail/UnitPrice")</div>
+                    <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmationMail/Price")</div>
+                    <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmationMail/Discount")</div>
+                    <div class="col-md-1 text-right">@Html.Translate("/OrderConfirmation/Labels/Total")</div>
+                </div>
+
+                foreach (ILineItem lineItem in shipment.LineItems)
+                {
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-1 col-xs-3">
+                            <a href="@lineItem.GetUrl()" class="link--black"><img src="@lineItem.GetThumbnailUrl()" /></a>
+                        </div>
+                        <div class="col-md-6 col-xs-9">
+                            <a href="@lineItem.GetUrl()" class="link--black">@lineItem.GetEntryContent().DisplayName</a>
+                        </div>
+                        <div class="col-md-1 col-xs-12 text-right">
+                            <label class="col-xs-8 visible-xs visible-sm">@Html.Translate("/OrderConfirmation/Labels/Quantity")</label>
+                            @lineItem.Quantity.ToString("0")
+                        </div>
+                        <div class="col-md-1 col-xs-12 text-right">
+                            <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmationMail/UnitPrice")</label>
+                            @Helpers.RenderMoney(lineItem.PlacedPrice, Model.Currency)
+                        </div>
+                        <div class="col-md-1 col-xs-12 text-right">
+                            <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmationMail/Price")</label>
+                            @Helpers.RenderMoney(lineItem.PlacedPrice * lineItem.Quantity, Model.Currency)
+                        </div>
+                        <div class="col-md-1 col-xs-12 text-right">
+                            <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmationMail/Discount")</label>
+                            @Helpers.RenderMoney(lineItem.GetEntryDiscount(), Model.Currency)
+                        </div>
+                        <div class="col-md-1 col-xs-12 text-right">
+                            <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmation/Labels/Total")</label>
+                            @Helpers.RenderMoney(lineItem.GetDiscountedPrice(Model.Currency))
+                        </div>
                     </div>
-                    <div class="col-md-1 col-xs-12 text-right">
-                        <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmationMail/Discount")</label>
-                        @Helpers.RenderMoney(lineItem.GetEntryDiscount(), Model.Currency)
+                }
+
+                <br />
+
+                <h4>@Html.Translate("/OrderConfirmation/ShippingDetails")</h4>
+                <table class="table">
+                    <tbody>
+                        <tr>
+                            <td class="text-right col-md-10">@Html.Translate("/OrderConfirmation/ShipmentCost")</td>
+                            <td class="total-price text-right col-md-2">@shipment.ShipmentCost</td>
+                        </tr>
+                        <tr>
+                            <td class="text-right">@Html.Translate("/OrderConfirmation/ShippingItemsTotal")</td>
+                            <td class="total-price text-right">@shipment.ShippingItemsTotal</td>
+                        </tr>
+                        <tr>
+                            <td class="text-right">@Html.Translate("/OrderConfirmation/ShippingMethod")</td>
+                            <td class="total-price text-right">@shipment.ShippingMethodName</td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <div class="row">
+                    <div class="col-md-6">
+
                     </div>
-                    <div class="col-md-1 col-xs-12 text-right">
-                        <label class="col-xs-8 visible-xs visible-sm text-right">@Html.Translate("/OrderConfirmation/Labels/Total")</label>
-                        @Helpers.RenderMoney(lineItem.GetDiscountedPrice(Model.Currency))
+                    <div class="col-md-6">
+                        <div class="well quicksilver-well">
+
+                            <h4>@Html.Translate("/OrderConfirmation/ShippingAddress")</h4>
+                            @Html.Partial("_Address", shipment.Address)
+                        </div>
                     </div>
                 </div>
             }
 
+            <br />
+            <br />
+            <br />
+
             <table class="table">
                 <tbody>
                     <tr>
@@ -107,23 +146,14 @@
 
                         <h4>@Html.Translate("/OrderConfirmation/BillingDetails")</h4>
                         @Html.Partial("_Address", Model.BillingAddress)
-
-                        <h4>@Html.Translate("/OrderConfirmation/ShippingDetails")</h4>
-                        @foreach (var shippingAddress in Model.ShippingAddresses)
-                        {
-                            @Html.Partial("_Address", shippingAddress)
-                        }
-
                     </div>
                 </div>
 
                 <div class="col-md-6">
-
                     @foreach (var payment in Model.Payments)
                     {
                         Html.RenderPartial("_" + payment.PaymentMethodName + "Confirmation", payment);
                     }
-
                 </div>
             </div>
 
@@ -137,5 +167,5 @@
         {
             @Html.Translate("/OrderConfirmation/NoOrder")
         }
-            </div>
-            </div>
+    </div>
+</div>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmationMailPage/Index.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmationMailPage/Index.cshtml
index 3bc3c8f8..e4e4591e 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmationMailPage/Index.cshtml
+++ b/Sources/EPiServer.Reference.Commerce.Site/Views/OrderConfirmationMailPage/Index.cshtml
@@ -26,34 +26,75 @@
                 {
                     <h2>@Html.Translate("/OrderHistory/Labels/OrderID") @Model.OrderId</h2>
                     @Html.Translate("/OrderHistory/Labels/OrderDate") @Model.Created
-                    
-                    <table style="width:100%; vertical-align: top; @fontFamily">
-                        <thead>
-                            <tr>
-                                <td style="@cellPadding">@Html.Translate("/OrderConfirmation/Labels/Product")</td>
-                                <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmation/Labels/Quantity")</td>
-                                <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmationMail/UnitPrice")</td>
-                                <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmationMail/Price")</td>
-                                <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmationMail/Discount")</td>
-                                <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmation/Labels/Total")</td>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (ILineItem lineItem in Model.Items)
-                            {
+
+                    foreach (var shipment in Model.Shipments)
+                    {
+
+                        <table style="width:100%; vertical-align: top; @fontFamily">
+                            <thead>
                                 <tr>
-                                    <td style="@horizontalLineStyle @cellPadding"><a href="@lineItem.GetFullUrl()">@lineItem.GetEntryContent().DisplayName</a></td>
-                                    <td style="text-align: right; @horizontalLineStyle @cellPadding">@lineItem.Quantity.ToString("0")</td>
-                                    <td style="text-align: right; @horizontalLineStyle @cellPadding">@Helpers.RenderMoney(lineItem.PlacedPrice, Model.Currency)</td>
-                                    <td style="text-align: right; @horizontalLineStyle @cellPadding">@Helpers.RenderMoney(lineItem.PlacedPrice * lineItem.Quantity, Model.Currency)</td>
-                                    <td style="text-align: right; @horizontalLineStyle @cellPadding">@Helpers.RenderMoney(lineItem.GetEntryDiscount(), Model.Currency)</td>
-                                    <td style="text-align: right; @horizontalLineStyle @cellPadding">@lineItem.GetDiscountedPrice(Model.Currency)</td>
+                                    <td style="@cellPadding">@Html.Translate("/OrderConfirmation/Labels/Product")</td>
+                                    <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmation/Labels/Quantity")</td>
+                                    <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmationMail/UnitPrice")</td>
+                                    <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmationMail/Price")</td>
+                                    <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmationMail/Discount")</td>
+                                    <td style="text-align: right; @cellPadding">@Html.Translate("/OrderConfirmation/Labels/Total")</td>
                                 </tr>
-                            }
-                        </tbody>
-                    </table>
-                    
-                    <table style="width:100%; vertical-align: top; @fontFamily">                        
+                            </thead>
+                            <tbody>
+                                @foreach (ILineItem lineItem in shipment.LineItems)
+                                {
+                                    <tr>
+                                        <td style="@horizontalLineStyle @cellPadding"><a href="@lineItem.GetFullUrl()">@lineItem.GetEntryContent().DisplayName</a></td>
+                                        <td style="text-align: right; @horizontalLineStyle @cellPadding">@lineItem.Quantity.ToString("0")</td>
+                                        <td style="text-align: right; @horizontalLineStyle @cellPadding">@Helpers.RenderMoney(lineItem.PlacedPrice, Model.Currency)</td>
+                                        <td style="text-align: right; @horizontalLineStyle @cellPadding">@Helpers.RenderMoney(lineItem.PlacedPrice * lineItem.Quantity, Model.Currency)</td>
+                                        <td style="text-align: right; @horizontalLineStyle @cellPadding">@Helpers.RenderMoney(lineItem.GetEntryDiscount(), Model.Currency)</td>
+                                        <td style="text-align: right; @horizontalLineStyle @cellPadding">@lineItem.GetDiscountedPrice(Model.Currency)</td>
+                                    </tr>
+                                }
+                            </tbody>
+                        </table>
+
+                        <br />
+
+                        <h4>@Html.Translate("/OrderConfirmation/ShippingDetails")</h4>
+                        <table class="table">
+                            <tbody>
+                            <tr>
+                                <td class="text-right col-md-10">@Html.Translate("/OrderConfirmation/ShipmentCost")</td>
+                                <td class="total-price text-right col-md-3">@shipment.ShipmentCost</td>
+                            </tr>
+                            <tr>
+                                <td class="text-right">@Html.Translate("/OrderConfirmation/ShippingItemsTotal")</td>
+                                <td class="total-price text-right col-md-3">@shipment.ShippingItemsTotal</td>
+                            </tr>
+                            <tr>
+                                <td class="text-right">@Html.Translate("/OrderConfirmation/ShippingMethod")</td>
+                                <td class="total-price text-right col-md-3">@shipment.ShippingMethodName</td>
+                            </tr>
+                            </tbody>
+                        </table>
+
+                        <div class="row">
+                            <div class="col-md-6">
+
+                            </div>
+                            <div class="col-md-6">
+                                <div class="well quicksilver-well">
+
+                                    <h4>@Html.Translate("/OrderConfirmation/ShippingAddress")</h4>
+                                    @Html.Partial("_Address", shipment.Address)
+                                </div>
+                            </div>
+                        </div>
+                    }
+
+                    <br />
+                    <br />
+                    <br />
+
+                    <table style="width:100%; vertical-align: top; @fontFamily">
                         <tbody>
                             <tr>
                                 <td style="width:80%; text-align: right; @horizontalLineStyle @cellPadding">@Html.Translate("/OrderConfirmationMail/OrderLevelDiscounts")</td>
@@ -86,25 +127,17 @@
                         </tbody>
                     </table>
 
-
                     <table style="width:100%; @fontFamily">
                         <tr>
                             <td style="vertical-align:top; width:50%;">
                                 <h4>@Html.Translate("/OrderConfirmation/BillingDetails")</h4>
                                 @Html.Partial("_Address", Model.BillingAddress)
-
-                                <h4>@Html.Translate("/OrderConfirmation/ShippingDetails")</h4>
-                                @foreach (var shippingAddress in Model.ShippingAddresses)
-                                {
-                                    @Html.Partial("_Address", shippingAddress)
-                                }
                             </td>
                             <td style="vertical-align:top; width:50%;">
                                 @foreach (var payment in Model.Payments)
                                 {
                                     Html.RenderPartial("_" + payment.PaymentMethodName + "Confirmation", payment);
                                 }
-
                             </td>
                         </tr>
                     </table>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Web.config b/Sources/EPiServer.Reference.Commerce.Site/Web.config
index 31ab31c2..bbcaf27c 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Web.config
+++ b/Sources/EPiServer.Reference.Commerce.Site/Web.config
@@ -237,87 +237,87 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Business.Commerce" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation.Data" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Marketing.Validators" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Payment" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Shipping" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Website" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Workflow" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.DataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.FileUploader" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.MetaDataPlus" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.Extensions" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.LuceneSearchProvider" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.SqlDataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.UI" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Internal.Migration" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Shell" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Shell.ManagerIntegration" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Perform.Commerce" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-11.8.0.0" newVersion="11.8.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.8.1.0" newVersion="11.8.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_EN.xml b/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_EN.xml
index 77591095..67e74623 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_EN.xml
+++ b/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_EN.xml
@@ -235,6 +235,10 @@
       <OrderLevelDiscounts>Additional Order Level Discounts</OrderLevelDiscounts>
       <ShippingAndTax>Shipping &amp; Tax</ShippingAndTax>
       <ShippingCost>Estimated Shipping Costs</ShippingCost>
+      <ShipmentCost>Shipment Cost</ShipmentCost>
+      <ShippingItemsTotal>Shipping Items Total</ShippingItemsTotal>
+      <ShippingMethod>Shipping Method</ShippingMethod>
+      <ShippingAddress>Shipping address</ShippingAddress>
       <TaxTotal>Estimated Tax to Be Collected</TaxTotal>
       <CartTotal>Total for cart</CartTotal>
       <BillingDetails>Billing details</BillingDetails>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_SV.xml b/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_SV.xml
index e8da4d0d..0a63a99d 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_SV.xml
+++ b/Sources/EPiServer.Reference.Commerce.Site/lang/Quicksilver_SV.xml
@@ -236,6 +236,10 @@
       <ShippingCost>Beräknade fraktkostnader</ShippingCost>
       <ShippingSubtotal>Frakt Delsumma</ShippingSubtotal>
       <ShippingDiscount>Frakt Rabatt</ShippingDiscount>
+      <ShipmentCost>Frakt Kostnad</ShipmentCost>
+      <ShippingItemsTotal>Varor Totalt</ShippingItemsTotal>
+      <ShippingMethod>Fraktsätt</ShippingMethod>
+      <ShippingAddress>Fraktaddress</ShippingAddress>
       <TaxTotal>Beräknad skatt </TaxTotal>
       <CartTotal>Total för kundvagnen</CartTotal>
       <BillingDetails>Faktureringsinformation</BillingDetails>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip
index 5a696db6..ac51446a 100644
Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip differ
diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip
index 7a8c82b3..b5ad1ee9 100644
Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip differ
diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip
index 9bc2c396..c3226d22 100644
Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip differ
diff --git a/Sources/EPiServer.Reference.Commerce.Site/packages.config b/Sources/EPiServer.Reference.Commerce.Site/packages.config
index 3b3afd41..21178a60 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Site/packages.config
@@ -68,10 +68,10 @@
   <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
   <package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net461" />
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
-  <package id="EPiServer.Commerce" version="11.8.0" targetFramework="net461"/>
-  <package id="EPiServer.Commerce.Core" version="11.8.0" targetFramework="net461"/>
-  <package id="EPiServer.Commerce.UI" version="11.8.0" targetFramework="net461"/>
-  <package id="EPiServer.Commerce.UI.ManagerIntegration" version="11.8.0" targetFramework="net461"/>
-  <package id="EPiServer.Tracking.Commerce" version="1.0.8" targetFramework="net461"/>
-  <package id="EPiServer.Personalization.Commerce" version="1.0.8" targetFramework="net461"/>
+  <package id="EPiServer.Commerce" version="11.8.1" targetFramework="net461"/>
+  <package id="EPiServer.Commerce.Core" version="11.8.1" targetFramework="net461"/>
+  <package id="EPiServer.Commerce.UI" version="11.8.1" targetFramework="net461"/>
+  <package id="EPiServer.Commerce.UI.ManagerIntegration" version="11.8.1" targetFramework="net461"/>
+  <package id="EPiServer.Tracking.Commerce" version="1.0.9" targetFramework="net461"/>
+  <package id="EPiServer.Personalization.Commerce" version="1.0.9" targetFramework="net461"/>
 </packages>