\ No newline at end of file
diff --git a/src/SeoToolkit.Umbraco.Site/Views/articleList.cshtml b/src/SeoToolkit.Umbraco.Site/Views/articleList.cshtml
index b55301b8..09454dc5 100644
--- a/src/SeoToolkit.Umbraco.Site/Views/articleList.cshtml
+++ b/src/SeoToolkit.Umbraco.Site/Views/articleList.cshtml
@@ -9,4 +9,15 @@
@await Html.PartialAsync("~/Views/Partials/pageHeader.cshtml", new PageHeaderViewModel(Model.Name, Model.Title, Model.Subtitle, Model.MainImage))
-@await Html.PartialAsync("~/Views/Partials/latestArticles.cshtml")
\ No newline at end of file
+@if (Model.ContentRows != null)
+{
+
+
+
+
+ @Html.GetBlockListHtml(Model.ContentRows)
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/SeoToolkit.Umbraco.Site/Views/contact.cshtml b/src/SeoToolkit.Umbraco.Site/Views/contact.cshtml
index ac330662..6cc6bd25 100644
--- a/src/SeoToolkit.Umbraco.Site/Views/contact.cshtml
+++ b/src/SeoToolkit.Umbraco.Site/Views/contact.cshtml
@@ -1,10 +1,9 @@
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
-@using Clean.Core.Controllers.Surface
@using Clean.Core.Models.ViewModels
@using ContentModels = Umbraco.Cms.Web.Common.PublishedModels
-@{
+@{
Layout = "master.cshtml";
var submitted = false;
if (bool.TryParse(TempData["Success"]?.ToString() ?? "", out var success))
@@ -15,37 +14,31 @@
@await Html.PartialAsync("~/Views/Partials/pageHeader.cshtml", new PageHeaderViewModel(Model.Name, Model.Title, Model.Subtitle, Model.MainImage))
-
- @if (submitted)
- {
-
-
-
+
+
+
+
+ @if(submitted)
+ {
+
@if (success)
{
-
Thanks for contacting us. We will be in touch soon.
+ @Model.SuccessMessage
}
else
{
-
There was an error when trying to submit the form. Please try again later.
-}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/SeoToolkit.Umbraco.Site/Views/content.cshtml b/src/SeoToolkit.Umbraco.Site/Views/content.cshtml
index 0cfa7cd2..6094703d 100644
--- a/src/SeoToolkit.Umbraco.Site/Views/content.cshtml
+++ b/src/SeoToolkit.Umbraco.Site/Views/content.cshtml
@@ -11,5 +11,11 @@
@await Html.PartialAsync("~/Views/Partials/pageHeader.cshtml", new PageHeaderViewModel(Model.Name, Model.Title, Model.Subtitle, Model.MainImage))
- @Html.GetGridHtml(Model, "mainContent", "Clean")
+
+
+
+ @Html.GetBlockListHtml(Model.ContentRows)
+
+
+
\ No newline at end of file
diff --git a/src/SeoToolkit.Umbraco.Site/Views/error.cshtml b/src/SeoToolkit.Umbraco.Site/Views/error.cshtml
index 023f186f..83852383 100644
--- a/src/SeoToolkit.Umbraco.Site/Views/error.cshtml
+++ b/src/SeoToolkit.Umbraco.Site/Views/error.cshtml
@@ -10,5 +10,11 @@
@await Html.PartialAsync("~/Views/Partials/pageHeader.cshtml", new PageHeaderViewModel(Model.Name, Model.Title, Model.Subtitle, Model.MainImage))
- @Html.GetGridHtml(Model, "mainContent", "Clean")
+
+
+
+ @Html.GetBlockListHtml(Model.ContentRows)
+
+
+
\ No newline at end of file
diff --git a/src/SeoToolkit.Umbraco.Site/Views/home.cshtml b/src/SeoToolkit.Umbraco.Site/Views/home.cshtml
index 044cab46..10a4128a 100644
--- a/src/SeoToolkit.Umbraco.Site/Views/home.cshtml
+++ b/src/SeoToolkit.Umbraco.Site/Views/home.cshtml
@@ -7,11 +7,17 @@
Layout = "master.cshtml";
}
-@if (Model.MainContent != null)
-{
-
- @Html.GetGridHtml(Model, "mainContent", "Clean")
-
-}
+@await Html.PartialAsync("~/Views/Partials/pageHeader.cshtml", new PageHeaderViewModel(Model.Name, Model.Title, Model.Subtitle, Model.MainImage))
-@await Html.PartialAsync("~/Views/Partials/latestArticles.cshtml")
\ No newline at end of file
+@if (Model.ContentRows != null)
+{
+
+