Re-arranged sidebar classes so they are in no-sidebars -> two-sidebars order in the layout CSS files.