fixed sidebar columnization

.themes/classic/sass/base/_layout.scss

@@ -19,7 +19,7 @@ body {
   max-width: $max-width;
   position: relative;
   margin: 0 auto;
-  > header, > nav, > footer, #content > article, #content > div > article {
+  > header, > nav, > footer, #content > article, #content > div > article, #content > div > nav {
     @extend .group;
     padding-left: $pad-min;
     padding-right: $pad-min;
@@ -89,7 +89,10 @@ body {
       background: none;
       float: left;
       margin: 0 -100% 0 0;
-      section, section.even { width: auto; margin: 0; }
+      section {
+        width: auto; margin-left: 0;
+        &.odd, &.even { float: none; width: auto; margin-left: 0; }
+      }
     }
     .collapse-sidebar & {
       margin-right: 10px;

.themes/classic/source/javascripts/octopress.js

@@ -21,7 +21,7 @@ function addSidebarToggler() {
     }
   });
   sections = $('aside[role=sidebar] > section')
-  if(sections.length >= 3){ $('aside[role=sidebar]').addClass('thirds') }
+  if(sections.length > 1){
     sections.each(function(section, index){
       if ((sections.length >= 3) && index % 3 == 0) {
         $(section).addClass("first");
@@ -29,6 +29,8 @@ function addSidebarToggler() {
       count = ((index +1) % 2) ? "odd" : "even";
       $(section).addClass(count);
     });
+  }
+  if(sections.length >= 3){ $('aside[role=sidebar]').addClass('thirds') }
 }
 function testFeatures() {
   var features = ['maskImage'];