diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
index abebf4316..90001aa12 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -479,22 +479,14 @@ ul.comments li div.text {
     /*border:1px solid #ff0000;*/
 }
 
-/* If zones 1 and 2 are empty in the quad */
+/* If zone 1 is empty and 2, 3, 4 are not */
+.split-234 #footer-quad-second div.zone { width:480px; }
 
-.split-left #footer-quad-third div.zone {
-    width:600px;
-}
+/* If zone 2 is empty and 1, 3, 4 are not */
+.split-134 #footer-quad-first div.zone { width:480px; }
 
-.split-left #footer-quad-fourth div.zone {
-    width:360px;
-}
+/* If zone 3 is empty and 1, 2, 4 are not */
+.split-124 #footer-quad-fourth div.zone { width:480px; }
 
-/* If zones 3 and 4 are empty in the quad */
-
-.split-right #footer-quad-first div.zone {
-    width:600px;
-}
-
-.split-right #footer-quad-second div.zone {
-    width:360px;
-}
\ No newline at end of file
+/* If zone 4 is empty and 1, 2, 3 are not */
+.split-123 #footer-quad-third div.zone { width:480px; }
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
index 938bd09ff..be3a6916f 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -21,13 +21,25 @@
     else {
 
     }
+    
+   // Debug Quad
+   // {WorkContext.Layout.FooterQuadSecond.Add("2 This is some test text to see if zones are working. This is some test text to see if zones are working.");}
+   // {WorkContext.Layout.FooterQuadFirst.Add("1 This is some test text to see if zones are working. This is some test text to see if zones are working.");}
+   // {WorkContext.Layout.FooterQuadThird.Add("3 This is some test text to see if zones are working. This is some test text to see if zones are working.");}
 
     //Add classes to the wrapper div to toggle quad widget zones on and off
-        if (Model.FooterQuadFirst == null && Model.FooterQuadSecond == null) {
-        Model.Classes.Add("split-left");
+
+        if (Model.FooterQuadFirst == null && Model.FooterQuadSecond != null && Model.FooterQuadThird != null && Model.FooterQuadFourth != null) {
+        Model.Classes.Add("split-234");
     }
-    else if (Model.FooterQuadThird == null && Model.FooterQuadFourth == null) {
-        Model.Classes.Add("split-right");
+    else if (Model.FooterQuadFirst != null && Model.FooterQuadSecond == null && Model.FooterQuadThird != null && Model.FooterQuadFourth != null) {
+        Model.Classes.Add("split-134");
+    }
+        else if (Model.FooterQuadFirst != null && Model.FooterQuadSecond != null && Model.FooterQuadThird == null && Model.FooterQuadFourth != null) {
+        Model.Classes.Add("split-124");
+    }
+        else if (Model.FooterQuadFirst != null && Model.FooterQuadSecond != null && Model.FooterQuadThird != null && Model.FooterQuadFourth == null) {
+        Model.Classes.Add("split-123");
     }
         else {