diff --git a/css/beach.css b/css/beach.css
index 8a3d06a5e92cb7a0654175ceef026cae026379f2..067f80589740e8b5045978ac12b1bb021e2f4819 100644
--- a/css/beach.css
+++ b/css/beach.css
@@ -24,20 +24,20 @@
   float:right;
 }
 
-.two-sidebars #main-content .inner {
+.two-sidebars #main-content .content-inner {
   margin-left: 230px;
   margin-right: 230px;
 }
 
-.sidebar-right #main-content .inner {
+.sidebar-right #main-content .content-inner {
   margin-right: 230px;
 }
 
-.sidebar-left #main-content .inner {
+.sidebar-left #main-content .content-inner {
   margin-left: 230px;
 }
 
-.inner {
+.content-inner {
   padding: 20px;
 }
 
@@ -69,6 +69,13 @@
   padding: 0 10px;
 }
 
+/**
+ * Fix table overlap when use 2 sidebars layout in admin pages.
+ */
+body.page-admin.two-sidebars .section {
+  min-width: 960px;
+}
+
 /**
  * Hidden Elements
  */
@@ -80,11 +87,6 @@
   visibility: hidden;
 }
 
-/* Fix table overlapping when use 2 sidebars layout in admin pages */
-body.page-admin.two-sidebars .section {
-  min-width: 960px;
-}
-
 #branding {
   float: left;
   margin: 0;
@@ -341,12 +343,12 @@ textarea {
   padding: 0 0 40px 0;
 }
 
-#main-content .inner {
+#main-content .content-inner {
   background: transparent url(../images/white-trans-50.png) 0 0 repeat;
 }
 
-body.page-node #main-content .inner,
-body.page-blog #main-content .inner {
+body.page-node #main-content .content-inner,
+body.page-blog #main-content .content-inner {
   background: url(../images/white-trans-25.png) 0 0 repeat;
 }
 
@@ -885,7 +887,7 @@ div.comment-content {
 #comments .links a {
   padding: 3px 10px;
   color: #fff;
-  background: #6bd;
+  background: #999;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
diff --git a/page-node.tpl.php b/page-node.tpl.php
index fb5982f37e88c34ebd27bb89c222710434ba4df0..e91f52e38bc4bbe8822105e8c0d1852ad195e4c4 100644
--- a/page-node.tpl.php
+++ b/page-node.tpl.php
@@ -85,7 +85,7 @@
         <?php endif; ?>
 
     <div id="main-content" class="column">
-    <div class="inner clear-block">
+    <div class="content-inner clear-block">
 
         <?php if ($breadcrumb): ?><div class="top-breadcrumb clear-block"><?php print $breadcrumb; ?></div><?php endif; ?>
 
diff --git a/page.tpl.php b/page.tpl.php
index f5ff456a26bf8eb53130adb1fbf414f257fa1f75..1873bd96965f1f553f168cdee98e4cb284890043 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -85,7 +85,7 @@
         <?php endif; ?>
 
     <div id="main-content" class="column">
-    <div class="inner clear-block">
+    <div class="content-inner clear-block">
 
         <?php if ($breadcrumb): ?><div class="top-breadcrumb clear-block"><?php print $breadcrumb; ?></div><?php endif; ?>