diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
index c30dea9..0573b1d 100644
--- a/Build/CommonAssemblyInfo.cs
+++ b/Build/CommonAssemblyInfo.cs
@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.40.0")]
-[assembly: AssemblyFileVersion("1.0.40.0")]
+[assembly: AssemblyVersion("1.0.41.0")]
+[assembly: AssemblyFileVersion("1.0.41.0")]
diff --git a/Build/publish-nuget.ps1 b/Build/publish-nuget.ps1
index 696af31..d9df517 100644
--- a/Build/publish-nuget.ps1
+++ b/Build/publish-nuget.ps1
@@ -1,6 +1,8 @@
 # http://www.jeremyskinner.co.uk/2011/01/12/automating-nuget-package-creation-with-msbuild-and-powershell/
 
-msbuild
+$scriptpath = split-path -parent $MyInvocation.MyCommand.Path
+
+msbuild $scriptpath/build.proj
 
 Function Get-DropBox() {
   $hostFile = Join-Path (Split-Path (Get-ItemProperty HKCU:\Software\Dropbox).InstallPath) "host.db"
@@ -10,12 +12,11 @@ Function Get-DropBox() {
 
 $dropbox = Get-DropBox
 $keyfile = "$dropbox\Personal\nuget-key.txt"
-$scriptpath = split-path -parent $MyInvocation.MyCommand.Path
 $nugetpath = resolve-path "$scriptpath/../.nuget/nuget.exe"
 $packagespath = resolve-path "$scriptpath/packages"
  
 if(-not (test-path $keyfile)) {
-  throw "Could not find the NuGet access key at $keyfile. If you're not Chris, you shouldn't be running this script!"
+  throw "Could not find the NuGet access key at $keyfile. If you're not the project owner, you shouldn't be running this script!"
 }
 else {  
   pushd $packagespath
diff --git a/Griddly.Mvc/GriddlySettings.cs b/Griddly.Mvc/GriddlySettings.cs
index e43202e..5b49ab4 100644
--- a/Griddly.Mvc/GriddlySettings.cs
+++ b/Griddly.Mvc/GriddlySettings.cs
@@ -131,16 +131,19 @@ public GriddlySettings Button(Func<object, object> argumentTemplate, string capt
             if (enableOnSelection == null)
                 enableOnSelection = (action == GriddlyButtonAction.Ajax || action == GriddlyButtonAction.AjaxBulk || action == GriddlyButtonAction.Post);
 
-            return Add(new GriddlyButton()
+            var button = new GriddlyButton()
             {
                 ArgumentTemplate = argumentTemplate,
                 Text = caption,
                 Icon = icon,
                 Action = action,
                 EnableOnSelection = enableOnSelection.Value,
-                ClassName = className,
                 Target = target
-            });
+            };
+
+            button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
+
+            return Add(button);
         }
 
         public GriddlySettings Button(string argument, string caption, string icon = null, GriddlyButtonAction action = GriddlyButtonAction.Navigate, bool? enableOnSelection = null, string className = null, string target = null)
@@ -148,16 +151,19 @@ public GriddlySettings Button(string argument, string caption, string icon = nul
             if (enableOnSelection == null)
                 enableOnSelection = (action == GriddlyButtonAction.Ajax || action == GriddlyButtonAction.AjaxBulk || action == GriddlyButtonAction.Post);
 
-            return Add(new GriddlyButton()
+            var button = new GriddlyButton()
             {
                 Argument = argument,
                 Text = caption,
                 Icon = icon,
                 Action = action,
                 EnableOnSelection = enableOnSelection.Value,
-                ClassName = className,
                 Target = target
-            });
+            };
+
+            button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
+
+            return Add(button);
         }
 
         public GriddlySettings ButtonSeparator()