Index: branches/1.0.x/designs/default_design.des.tpl
===================================================================
diff -u -N -r14739 -r14747
--- branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14739)
+++ branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14747)
@@ -2,8 +2,6 @@
 <inp2:m_Include template="elements/html_head.elm" strip_nl="2"/>
 <inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>  <!--## includes system elements ##-->
 
-<inp2:m_DefaultParam columns="2"/>
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
@@ -31,17 +29,31 @@
 	
 		<div id="content">		
 			<div class="padding">
+				
+				<inp2:m_if check="m_Param" name="before_content">
+					<inp2:m_RenderElement name="$before_content" />			
+				</inp2:m_if>			
+				
+				<inp2:m_if check="m_Param" name="left_column">
 			
-				<inp2:m_if check="m_Param" name="columns" equals_to="2">
-			
 					<div class="leftcol">
-						<inp2:m_RenderElement name="sidebar" default_element="default_sidebar"/>
+						<inp2:m_RenderElement name="$left_column" />
 					</div>
 				
 					<div class="contentcol">
-						<inp2:m_RenderElement name="content"/>
+						<inp2:m_RenderElement name="content" />
 					</div>
 					
+				<inp2:m_elseif check="m_Param" name="right_column" />
+								
+					<div class="contentcol">
+						<inp2:m_RenderElement name="content" />
+					</div>
+					
+					<div class="rightcol">
+						<inp2:m_RenderElement name="$right_column" />
+					</div>				
+					
 				<inp2:m_else/>
 				
 					<inp2:m_RenderElement name="content"/>
