diff --git a/css/beach.css b/css/beach.css
index 0904c7fe09a4c050fc1d3ed5ef1fcbed7731a33d..23798734cbd2957dfea38320e82d7f46f02a9074 100644
--- a/css/beach.css
+++ b/css/beach.css
@@ -625,8 +625,9 @@ div.terms {
 
 .footer-column {
   float: left;
+  width: 25%;
 }
-
+/*
 .wrap-1-col .footer-column {
   width: 100%;
 }
@@ -652,7 +653,7 @@ div.terms {
   width: 32.9%;
   margin-right: 0;
 }
-
+*/
 .last-column .block {
   margin-right: 0;
 }
diff --git a/page.tpl.php b/page.tpl.php
index 2db47e6e83ed158e34f6f66013fb3de3b51c1f54..9f24f7420e56da7b94eefff472cea4f9dfe3def8 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -105,35 +105,33 @@
   <div id="bottom-wrapper" class="clear-block">
     <div id="footer" class="section <?php print $attributes ?>">
 
-      <?php if ($footer_column_count !== 0): ?>
-        <div class="wrap-<?php print $footer_column_count ?>-col column-wrapper clear-block">
+        <div class="wrap-col column-wrapper clear-block">
 
-          <?php if ($footer_1): ?>
+          <?php if ($page['footer_1']): ?>
             <div class="footer-column">
-              <?php print $footer_1 ?>
+              <?php print render($page['footer_1']); ?>
             </div>
           <?php endif; ?>
 
-          <?php if ($footer_2): ?>
-            <div class="footer-column<?php print $column2_is_last ?>">
-              <?php print $footer_2 ?>
+          <?php if ($page['footer_2']): ?>
+            <div class="footer-column">
+              <?php print render($page['footer_2']); ?>
             </div>
           <?php endif; ?>
 
-          <?php if ($footer_3): ?>
-            <div class="footer-column<?php print $column3_is_last ?>">
-              <?php print $footer_3 ?>
+          <?php if ($page['footer_3']): ?>
+            <div class="footer-column">
+              <?php print render($page['footer_3']); ?>
             </div>
           <?php endif; ?>
 
-          <?php if ($footer_4): ?>
-            <div class="footer-column<?php print $column4_is_last ?>">
-              <?php print $footer_4 ?>
+          <?php if ($page['footer_4']): ?>
+            <div class="footer-column">
+              <?php print render($page['footer_4']); ?>
             </div>
           <?php endif; ?>
 
         </div> <!-- /footer-column-wrap -->
-      <?php endif; ?>
 
       <div id="credit-wrap" class="clear-block">
        <?php print render($page['footer']); ?>