diff --git a/WebCms/Utility/CssClassUtil.cs b/WebCms/Utility/CssClassUtil.cs
new file mode 100644
index 0000000..9d437fd
--- /dev/null
+++ b/WebCms/Utility/CssClassUtil.cs
@@ -0,0 +1,35 @@
+using System.Linq;
+using System.Web.Mvc;
+
+namespace LeafWeb.WebCms.Utility
+{
+    public static class CssClassUtil
+    {
+        private const string KeyName = "cssClass";
+        public static ViewDataDictionary CreateCssClassDataDictionary(params string[] cssClasses) 
+            => new ViewDataDictionary { { KeyName, cssClasses.ToArray() } };
+
+        public static void AddCssClass(this ViewDataDictionary vdd, string cssClass)
+        {
+            if (!vdd.ContainsKey(KeyName))
+                vdd["cssClass"] = new []{ cssClass };
+            else
+            {
+                var cssClassList = ((string[])vdd[KeyName]).ToList();
+                if (!cssClassList.Contains(cssClass))
+                    cssClassList.Add(cssClass);
+                vdd[KeyName] = cssClassList.ToArray();
+            }
+        }
+
+        public static void SetButtonDisabled(this ViewDataDictionary vdd)
+        {
+            vdd.AddCssClass("disabled");
+        }
+
+        public static bool IsButtonDisabled(this ViewDataDictionary vdd)
+        {
+            return vdd.ContainsKey(KeyName) && ((string[]) vdd[KeyName]).Contains("disabled");
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebCms/Views/Queue/Details.cshtml b/WebCms/Views/Queue/Details.cshtml
index f934019..d6bafde 100644
--- a/WebCms/Views/Queue/Details.cshtml
+++ b/WebCms/Views/Queue/Details.cshtml
@@ -1,62 +1,64 @@
 @using LeafWeb.WebCms.Controllers
+@using LeafWeb.WebCms.Utility
 @model LeafInputDetails
 
 <div class="row pb-3">
-        @Html.Partial("DisplayTemplates/_ChartButton", Model.LeafInputId, new ViewDataDictionary {{"Disabled", !Model.HasLeafChart}})
+    
+    @ChartLink(Model)
 
-        <div class="dropdown pl-3">
-            <button class="btn btn-outline-secondary dropdown-toggle" id="downloadButton"
-                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <span class="fa fa-download"></span> Download
-            </button>
-            <div class="dropdown-menu" aria-labelledby="downloadButton">
-                <a href="@Url.Action("DownloadInput", "Queue", new {id = Model.LeafInputId})"
-                   class="dropdown-item">
-                    Input
-                </a>
-                <a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = Model.LeafInputId})"
-                   class="dropdown-item @if (!Model.HasOutputFiles) {<text> disabled</text>}">
-                    ToUser
-                </a>
+    <div class="dropdown pl-3">
+        <button class="btn btn-outline-secondary dropdown-toggle" id="downloadButton"
+                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <span class="fa fa-download"></span> Download
+        </button>
+        <div class="dropdown-menu" aria-labelledby="downloadButton">
+            <a href="@Url.Action("DownloadInput", "Queue", new {id = Model.LeafInputId})"
+               class="dropdown-item">
+                Input
+            </a>
+            <a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = Model.LeafInputId})"
+               class="dropdown-item @if (!Model.HasOutputFiles) {<text> disabled</text>}">
+                ToUser
+            </a>
 
-                <a href="@Url.Action("DownloadOutputNotToUser", "Queue", new {id = Model.LeafInputId})"
-                   class="dropdown-item @if (!Model.HasOutputFiles) {<text> disabled</text>}">
-                     NotToUser
-                </a>
-            </div>
+            <a href="@Url.Action("DownloadOutputNotToUser", "Queue", new {id = Model.LeafInputId})"
+               class="dropdown-item @if (!Model.HasOutputFiles) {<text> disabled</text>}">
+                NotToUser
+            </a>
         </div>
+    </div>
 
-        <div class="dropdown pl-3">
-            <button class="btn btn-outline-secondary dropdown-toggle" id="utilityButton"
-                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Utility
-            </button>
-            <div class="dropdown-menu" aria-labelledby="utilityButton">
-                @using (Html.BeginUmbracoForm<QueueController>(
-                    "SendUserDownloadLink", null, new {@class = "confirm", confirm_msg = "Confirm sending email to user"}))
-                {
-                    <input type="hidden" name="id" value="@Model.LeafInputId"/>
-                    <button type="submit" class="dropdown-item text-left"
-                            @{if (!Model.HasOutputFiles)
-                            {
-                                <text> disabled="disabled" </text>
-                            }}>
-                        <span class="fa fa-send"></span> Email User Download link
-                    </button>
-                }
-            </div>
+    <div class="dropdown pl-3">
+        <button class="btn btn-outline-secondary dropdown-toggle" id="utilityButton"
+                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Utility
+        </button>
+        <div class="dropdown-menu" aria-labelledby="utilityButton">
+            @using (Html.BeginUmbracoForm<QueueController>(
+                "SendUserDownloadLink", null, new {@class = "confirm", confirm_msg = "Confirm sending email to user"}))
+            {
+                <input type="hidden" name="id" value="@Model.LeafInputId"/>
+                <button type="submit" class="dropdown-item text-left"
+                        @{if (!Model.HasOutputFiles)
+                        {
+                            <text> disabled="disabled" </text>
+                        }}>
+                    <span class="fa fa-send"></span> Email User Download link
+                </button>
+            }
         </div>
+    </div>
 
-        @if (Model.IsCancellable)
-        {
-            <div class="pl-3">
-                @CancelLink(Model)
-            </div>
-        }
-
+    @if (Model.IsCancellable)
+    {
         <div class="pl-3">
-            @DeleteLink(Model)
+            @CancelLink(Model)
         </div>
+    }
+
+    <div class="pl-3">
+        @DeleteLink(Model)
+    </div>
 </div>
 <div class="row">
     <div class="container">
@@ -64,12 +66,37 @@
     </div>
 </div>
 
+@helper ChartLink(dynamic item)
+{
+    var cssClass 
+        = CssClassUtil.CreateCssClassDataDictionary("btn", "btn-outline-secondary");
+
+    if (!item.HasLeafChart)
+    {
+        cssClass.SetButtonDisabled();
+    }
+    @Html.Partial("DisplayTemplates/_ChartLink", (int)item.LeafInputId, cssClass)
+}
+
 @helper DeleteLink(LeafInputDetails item)
 {
-    @Html.Partial("DisplayTemplates/_DeleteForm", Tuple.Create(item.LeafInputId, item.Identifier, item.IsDeletable, false))
+    var cssClass
+        = CssClassUtil.CreateCssClassDataDictionary("btn", "btn-outline-secondary");
+    if (!item.IsDeletable)
+    {
+        cssClass.SetButtonDisabled();
+    }
+
+    @Html.Partial("DisplayTemplates/_DeleteForm", Tuple.Create(item.LeafInputId, item.Identifier), cssClass)
 }
 
 @helper CancelLink(LeafInputDetails item)
 {
-    @Html.Partial("DisplayTemplates/_CancelForm", Tuple.Create(item.LeafInputId, item.Identifier, false))
+    var cssClass
+        = CssClassUtil.CreateCssClassDataDictionary("btn", "btn-outline-secondary");
+    if (!item.IsCancellable)
+    {
+        cssClass.SetButtonDisabled();
+    }
+    @Html.Partial("DisplayTemplates/_CancelForm", Tuple.Create(item.LeafInputId, item.Identifier), cssClass)
 }
\ No newline at end of file
diff --git a/WebCms/Views/Queue/Index.cshtml b/WebCms/Views/Queue/Index.cshtml
index 3bee08a..e0a1cdc 100644
--- a/WebCms/Views/Queue/Index.cshtml
+++ b/WebCms/Views/Queue/Index.cshtml
@@ -1,6 +1,6 @@
 @using ClientDependency.Core.Mvc
 @using LeafWeb.Core.Entities
-@using LeafWeb.WebCms.Controllers
+@using LeafWeb.WebCms.Utility
 @model QueueViewModel
 
 @{
@@ -13,16 +13,16 @@
     var grid = new WebGrid(Model.Items, rowsPerPage: 45);
 }
 
-@using (Html.BeginUmbracoForm("Search", "Queue", null, new {@action = "/leaf-data/manage-queue/"}))
+@using (Html.BeginUmbracoForm("Search", "Queue", null, new { @action = "/leaf-data/manage-queue/" }))
 {
     <div class="row">
         <div class="col-lg-8 font-italic font-weight-light">
             @Model.Items.Count() results<br />
             Service description: @Model.ServerDescription
             @*Est. processing time by LeafInput size -
-        <i class="fa fa-file-o"></i> 1: <strong>@Model.TimeInProgressEstimater.EstimateTimeInProgress(1).ToRoundedReadableString()</strong>
-        <i class="fa fa-file-o"></i> 10: <strong>@Model.TimeInProgressEstimater.EstimateTimeInProgress(10).ToRoundedReadableString()</strong>
-        <i class="fa fa-file-o"></i> 100: <strong>@Model.TimeInProgressEstimater.EstimateTimeInProgress(100).ToRoundedReadableString()</strong>*@
+                <i class="fa fa-file-o"></i> 1: <strong>@Model.TimeInProgressEstimater.EstimateTimeInProgress(1).ToRoundedReadableString()</strong>
+                <i class="fa fa-file-o"></i> 10: <strong>@Model.TimeInProgressEstimater.EstimateTimeInProgress(10).ToRoundedReadableString()</strong>
+                <i class="fa fa-file-o"></i> 100: <strong>@Model.TimeInProgressEstimater.EstimateTimeInProgress(100).ToRoundedReadableString()</strong>*@
         </div>
         <div class="col-lg-4">
             <div class="input-group">
@@ -48,31 +48,31 @@
                     @Html.EditorFor(m => m.Q.species)
                 </div>
             </div>
-            <hr/>
+            <hr />
             <div class="row">
                 <div class="col-md-6">
                     <div class="row">
                         <div class="col-sm-7">
-                            @Html.EditorFor(m => m.Q.lat, new {size = "small", append = "&deg;"})
+                            @Html.EditorFor(m => m.Q.lat, new { size = "small", append = "&deg;" })
                         </div>
                         <div class="col-sm-5">
-                            @Html.EditorFor(m => m.Q.latr, new {size = "small", prepend = "&plusmn;", append = "&deg;"})
+                            @Html.EditorFor(m => m.Q.latr, new { size = "small", prepend = "&plusmn;", append = "&deg;" })
                         </div>
                     </div>
                 </div>
                 <div class="col-md-6 border-left">
                     <div class="row">
                         <div class="col-sm-7">
-                            @Html.EditorFor(m => m.Q.lon, new {size = "small", append = "&deg;"})
+                            @Html.EditorFor(m => m.Q.lon, new { size = "small", append = "&deg;" })
                         </div>
                         <div class="col-sm-5">
-                            @Html.EditorFor(m => m.Q.lonr, new {size = "small", prepend = "&plusmn;", append = "&deg;"})
+                            @Html.EditorFor(m => m.Q.lonr, new { size = "small", prepend = "&plusmn;", append = "&deg;" })
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-     </div>
+    </div>
 }
 
 
@@ -83,11 +83,11 @@
             grid.Columns(
                 grid.Column("Identifier", "Identifier"),
                 grid.Column("SiteId", "Site Id"),
-                grid.Column("Name", "Submitted By" ),
+                grid.Column("Name", "Submitted By"),
                 grid.Column("TimeInProgress", "Statistics", item => Statistics(item.Value), canSort: false),
                 grid.Column("CurrentStatus", "Status", item => Status(item.Value), canSort: false),
                 grid.Column("", format: item => Actions(item.Value), canSort: false)),
-            htmlAttributes: new {@class = "table table-sm table-striped table-bordered table-hover"}
+            htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
             )
         @grid.BootstrapPager()
     </div>
@@ -106,7 +106,7 @@ else
 {
     <div class="btn-group text-nowrap" role="group">
         <div class="btn-group" role="group">
-            <button id="actions(@item.Id)" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" 
+            <button id="actions(@item.Id)" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"
                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Actions">
                 <span class="d-none d-sm-inline">Actions</span>
             </button>
@@ -129,9 +129,9 @@ else
                 <div class="dropdown-divider"></div>
                 <h6 class="dropdown-header">Download</h6>
                 @DownloadInput(item)
-                <button class="dropdown-item @DisableItem(!item.HasOutputFiles)">@DownloadOutputToUser(item)</button>
+                @DownloadOutputToUser(item)
                 <div class="dropdown-divider"></div>
-                <button class="dropdown-item @DisableItem(!item.IsDeletable)">@DeleteLink(item)</button>
+                @DeleteLink(item)
             </div>
         </div>
     </div>
@@ -139,17 +139,20 @@ else
 
 @helper DetailsLink(dynamic item)
 {
-    @Html.Partial("DisplayTemplates/_DetailsLink", (int)item.Id, new ViewDataDictionary {{"cssClass", new[]{"dropdown-item"}}})
+    var cssClass= CssClassUtil.CreateCssClassDataDictionary("dropdown-item");
+
+    @Html.Partial("DisplayTemplates/_DetailsLink", (int)item.Id, cssClass)
 }
 
 @helper ChartLink(dynamic item)
 {
-    var classes = new[]{"dropdown-item"};
+    var cssClass= CssClassUtil.CreateCssClassDataDictionary("dropdown-item");
+
     if (!item.HasLeafChart)
     {
-        classes = classes.Concat(new[] {"disabled"}).ToArray();
+        cssClass.SetButtonDisabled();
     }
-    @Html.Partial("DisplayTemplates/_ChartLink", (int)item.Id, new ViewDataDictionary {{"cssClass", classes}})
+    @Html.Partial("DisplayTemplates/_ChartLink", (int)item.Id, cssClass)
 }
 
 @helper DownloadInput(dynamic item)
@@ -160,7 +163,7 @@ else
 }
 @helper DownloadOutputToUser(dynamic item)
 {
-    <a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = item.Id})" class="dropdown-item">
+    <a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = item.Id})" class="dropdown-item @DisableItem(!item.HasOutputFiles)">
         <span class="fa fa-download"></span> ToUser
     </a>
 }
@@ -177,45 +180,64 @@ else
     }
     var summaryText = string.Join(Environment.NewLine, summary);
     <span class="text-nowrap" title="@summaryText">
-        <i class="fa fa-file-o"></i> @leafInput.InputFiles.Count @if(leafInput.InputFiles.Count > 1) {<text>inputs</text>} else { <text>input</text>}
+        <i class="fa fa-file-o"></i> @leafInput.InputFiles.Count @if (leafInput.InputFiles.Count > 1)
+        {<text>inputs</text>}
+    else
+    { <text>input</text>}
         <br />
         @if (leafInput.TimeInProgress > TimeSpan.Zero)
         {
             <text>
-            <i class="fa fa-clock-o"></i> @leafInput.TimeInProgress.ToRoundedReadableString()
+                <i class="fa fa-clock-o"></i> @leafInput.TimeInProgress.ToRoundedReadableString()
             </text>
         }
         else if (leafInput.IsPending)
         {
             <text>
-            <i class="fa fa-hourglass-start"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) est.
+                <i class="fa fa-hourglass-start"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) est.
             </text>
         }
         @if (leafInput.IsRunning)
         {
             <text>
-            <br />
-            <i class="fa fa-hourglass-half"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) left
+                <br />
+                <i class="fa fa-hourglass-half"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) left
             </text>
         }
     </span>
 }
 @helper DeleteLink(LeafInput item)
 {
-    @Html.Partial("DisplayTemplates/_DeleteForm", Tuple.Create(item.Id, item.Identifier, item.IsDeletable, true), new ViewDataDictionary {{"cssClass", new[]{"dropdown-item"}}})
+    var cssClass 
+        = CssClassUtil.CreateCssClassDataDictionary("dropdown-item");
+    if (!item.IsDeletable)
+    {
+        cssClass.SetButtonDisabled();
+    }
+    @Html.Partial("DisplayTemplates/_DeleteForm", Tuple.Create(item.Id, item.Identifier), cssClass)
 }
 
 @helper CancelLink(LeafInput item)
 {
-    @Html.Partial("DisplayTemplates/_CancelForm", Tuple.Create(item.Id, item.Identifier, true), new ViewDataDictionary {{"cssClass", new[]{"dropdown-item"}}})
+    var cssClass 
+        = CssClassUtil.CreateCssClassDataDictionary("dropdown-item");
+    if (!item.IsCancellable)
+    {
+        cssClass.SetButtonDisabled();
+    }
+    @Html.Partial("DisplayTemplates/_CancelForm", Tuple.Create(item.Id, item.Identifier), cssClass)
 }
 
 @helper PriorityForm(LeafInput item, Priority priority)
 {
-    @Html.Partial("DisplayTemplates/_PriorityForm", Tuple.Create(item.Id, item.PendingPriority, priority), new ViewDataDictionary {{"cssClass", new[]{"dropdown-item"}}})
+    var cssClass 
+        = CssClassUtil.CreateCssClassDataDictionary("dropdown-item");
+
+    @Html.Partial("DisplayTemplates/_PriorityForm", Tuple.Create(item.Id, item.PendingPriority, priority), cssClass)
 }
 
 @helper DisableItem(bool disabled)
 {
-if (disabled){<text>disabled</text>}
+    if (disabled)
+    {<text>disabled</text>}
 }
\ No newline at end of file
diff --git a/WebCms/Views/Results/Index.cshtml b/WebCms/Views/Results/Index.cshtml
index 4279d5d..5d04d93 100644
--- a/WebCms/Views/Results/Index.cshtml
+++ b/WebCms/Views/Results/Index.cshtml
@@ -1,6 +1,6 @@
 @using LeafWeb.Core.Entities
+@using LeafWeb.WebCms.Utility
 @model IQueryable<LeafInput>
-
 @{
     var grid = new WebGrid(Model, rowsPerPage: 45);
 }
@@ -21,7 +21,12 @@
 
 @helper ChartLink(LeafInput leafInput)
 {
-    @Html.Partial("DisplayTemplates/_ChartButton", leafInput.Id, new ViewDataDictionary { { "Disabled", !leafInput.HasLeafChart }, {"xs", true} })
+    var cssClass = CssClassUtil.CreateCssClassDataDictionary("btn", " btn-outline-secondary", "btn-sm");
+    if (!leafInput.HasLeafChart)
+    {
+        cssClass.SetButtonDisabled();
+    }
+    @Html.Partial("DisplayTemplates/_ChartButton", leafInput.Id, cssClass)
 }
 
 @helper Status(LeafInput leafInput)
diff --git a/WebCms/Views/Shared/DisplayTemplates/LeafInputDataSiteViewModels.cshtml b/WebCms/Views/Shared/DisplayTemplates/LeafInputDataSiteViewModels.cshtml
index de5bd91..3a854d6 100644
--- a/WebCms/Views/Shared/DisplayTemplates/LeafInputDataSiteViewModels.cshtml
+++ b/WebCms/Views/Shared/DisplayTemplates/LeafInputDataSiteViewModels.cshtml
@@ -1,12 +1,24 @@
 @model IEnumerable<LeafInputDataSiteViewModel>
 @{
-    Layout = "~/Views/Shared/DisplayTemplates/_FieldLayout.cshtml";
-    var grid = new WebGrid(Model, rowsPerPage: 45)
-    {
-    };
+    //Layout = "~/Views/Shared/DisplayTemplates/_FieldLayout.cshtml";
+    Rend("Site Id", string.Join(", ", Model.Select(m => m.SiteId).Distinct()));
+    Rend("Latitude", string.Join(", ", Model.Select(m => m.Latitude).Distinct()));
 }
 
-@grid.GetHtml(columns:
+@helper Rend(string label, string value)
+{
+    <div class="row pb-lg-2 pb-sm-1 @if (ViewData.Model == null){<text>d-none</text> }">
+        <div class="col-sm-3 text-truncate">
+            @label
+        </div>
+        <div class="col-sm-9">
+            @value
+        </div>
+    </div>
+}
+
+
+@*@grid.GetHtml(columns:
     grid.Columns(
         grid.Column("SiteId"),
         grid.Column("Latitude"),
@@ -14,4 +26,4 @@
         grid.Column("Elevation")
         ),
     htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
-    )
+    )*@
diff --git a/WebCms/Views/Shared/DisplayTemplates/_CancelForm.cshtml b/WebCms/Views/Shared/DisplayTemplates/_CancelForm.cshtml
index d0b0faa..c5649ae 100644
--- a/WebCms/Views/Shared/DisplayTemplates/_CancelForm.cshtml
+++ b/WebCms/Views/Shared/DisplayTemplates/_CancelForm.cshtml
@@ -1,16 +1,15 @@
 @using LeafWeb.WebCms.Controllers
-@model Tuple<int, string, bool>
+@using LeafWeb.WebCms.Utility
+@model Tuple<int, string>
 @{
     var leafInputId = Model.Item1;
     var identifier = Model.Item2;
-    // true for a link, false for a button
-    var buttonType = Model.Item3 ? "btn-link" : "btn-outline-secondary";
 }
 @using (Html.BeginUmbracoForm<QueueController>("Cancel", null, 
     new { @class = "confirm clearfix", confirm_msg = "Cancelling cannot be undone! Confirm cancelling '" + identifier + "'." }))
 {
     <input type="hidden" name="id" value="@leafInputId"/>
-    <button type="submit" class="btn @buttonType">
+    <button type="submit" @Html.Partial("DisplayTemplates/_ViewDataCssClass") @if(ViewData.IsButtonDisabled()) {<text>disabled</text>}>
         <span class="fa fa-ban"></span> Cancel
     </button>
 }
\ No newline at end of file
diff --git a/WebCms/Views/Shared/DisplayTemplates/_ChartButton.cshtml b/WebCms/Views/Shared/DisplayTemplates/_ChartButton.cshtml
index 0b2edfd..207dd95 100644
--- a/WebCms/Views/Shared/DisplayTemplates/_ChartButton.cshtml
+++ b/WebCms/Views/Shared/DisplayTemplates/_ChartButton.cshtml
@@ -1,14 +1,11 @@
 @using LeafWeb.WebCms.Controllers
+@using LeafWeb.WebCms.Utility
 @model int
 @{
     var url = UmbracoContext.Current.UrlProvider.GetUrl(LeafWebPageIds.Chart);
-    var disabled = ViewData.ContainsKey("Disabled") && (bool) ViewData["Disabled"];
-    var xs = ViewData.ContainsKey("xs") && (bool) ViewData["xs"];
 }
-<a href="@url?leafInputId=@Model"
-   class="btn btn-outline-secondary @{if (xs) {<text>btn-sm</text>}} @{if (disabled) {<text>disabled</text>}}"
-   role="button"
-   @{if (disabled) {<text>title="No chart has been generated"</text>}} > 
+<a href="@url?leafInputId=@Model" @Html.Partial("DisplayTemplates/_ViewDataCssClass") role="button"
+   @if (ViewData.IsCssDisabled()) {<text>title="No chart has been generated"</text>} > 
     <span class="fa fa-line-chart" title="Charts"></span>
     <span class="d-none d-sm-inline">Charts</span>
 </a>
\ No newline at end of file
diff --git a/WebCms/Views/Shared/DisplayTemplates/_ChartLink.cshtml b/WebCms/Views/Shared/DisplayTemplates/_ChartLink.cshtml
index 76aa722..68803f7 100644
--- a/WebCms/Views/Shared/DisplayTemplates/_ChartLink.cshtml
+++ b/WebCms/Views/Shared/DisplayTemplates/_ChartLink.cshtml
@@ -3,7 +3,6 @@
 @{
     var url = UmbracoContext.Current.UrlProvider.GetUrl(LeafWebPageIds.Chart);
 }
-<a href="@url?leafInputId=@Model" @Html.Partial("DisplayTemplates/_ViewDataCssClass", new [] {"dropdown-item"}, ViewData)>
-    <span class="fa fa-line-chart"></span>
-    Chart
+<a href="@url?leafInputId=@Model" @Html.Partial("DisplayTemplates/_ViewDataCssClass")>
+    <span class="fa fa-line-chart"></span> Charts
 </a>
\ No newline at end of file
diff --git a/WebCms/Views/Shared/DisplayTemplates/_DeleteForm.cshtml b/WebCms/Views/Shared/DisplayTemplates/_DeleteForm.cshtml
index 56de22b..fefb424 100644
--- a/WebCms/Views/Shared/DisplayTemplates/_DeleteForm.cshtml
+++ b/WebCms/Views/Shared/DisplayTemplates/_DeleteForm.cshtml
@@ -1,17 +1,15 @@
 @using LeafWeb.WebCms.Controllers
-@model Tuple<int, string, bool, bool>
+@using LeafWeb.WebCms.Utility
+@model Tuple<int, string>
 @{
     var leafInputId = Model.Item1;
     var identifier = Model.Item2;
-    var isDeletable = Model.Item3;
-    // true for a link, false for a button
-    var buttonType = Model.Item4 ? "btn-link" : "btn-outline-secondary";
 }
 @using (Html.BeginUmbracoForm<QueueController>("Delete", null, 
     new { @class = "confirm clearfix", confirm_msg = "Deletion cannot be undone! Confirm deleting '" + identifier + "'." }))
 {
     <input type="hidden" name="id" value="@leafInputId"/>
-    <button type="submit" class="btn @buttonType" @{if (!isDeletable) { <text> disabled="disabled" </text>  }}>
+    <button type="submit" @Html.Partial("DisplayTemplates/_ViewDataCssClass") @if(ViewData.IsButtonDisabled()) {<text>disabled</text>}>
         <span class="fa fa-remove"></span> Delete
     </button>
 }
\ No newline at end of file
diff --git a/WebCms/Views/Shared/DisplayTemplates/_FieldLayout.cshtml b/WebCms/Views/Shared/DisplayTemplates/_FieldLayout.cshtml
index 7fc8daf..007a641 100644
--- a/WebCms/Views/Shared/DisplayTemplates/_FieldLayout.cshtml
+++ b/WebCms/Views/Shared/DisplayTemplates/_FieldLayout.cshtml
@@ -1,20 +1,21 @@
 @using LeafWeb.Core.Utility
 @{
     Layout = null;
-    var lowerPropertyName = ViewData.ModelMetadata.PropertyName.ToFirstLower();
+    var meta = ViewData.ModelMetadata;
+    var lowerPropertyName = meta.PropertyName.ToFirstLower();
     var displayName = 
-        string.IsNullOrEmpty(ViewData.ModelMetadata.DisplayName) 
-        ? ViewData.ModelMetadata.PropertyName.SplitCamelCase()
-        : ViewData.ModelMetadata.DisplayName;
+        string.IsNullOrEmpty(meta.DisplayName) 
+        ? meta.PropertyName.SplitCamelCase()
+        : meta.DisplayName;
     
 	// string units = (string)ViewData.ModelMetadata.AdditionalValues.ContainsKey("Units") ? ["Units"];
 }
 
-<div class="row @lowerPropertyName @if (ViewData.Model == null){<text>d-none</text> }">
-    <div class="col-sm-3 text-truncate">
+<div class="row pb-lg-3 pb-2 @lowerPropertyName @if (ViewData.Model == null){<text>d-none</text> }">
+    <div class="col-sm-3 text-truncate font-weight-bold border-bottom border-right">
         @displayName
     </div>
-    <div class="col-sm-9">
+    <div class="col-sm-9 border-bottom pl-5 pl-sm-2">
         @RenderBody()
     </div>
 </div>
\ No newline at end of file
diff --git a/WebCms/WebCms.csproj b/WebCms/WebCms.csproj
index 4ecacbe..833f527 100644
--- a/WebCms/WebCms.csproj
+++ b/WebCms/WebCms.csproj
@@ -1133,6 +1133,7 @@
     <Compile Include="Utility\QueryFilter.cs" />
     <Compile Include="Utility\RequireRequestValueAttribute.cs" />
     <Compile Include="Utility\Validation.cs" />
+    <Compile Include="Utility\CssClassUtil.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj">