Index: branches/1.0.x/designs/default_design.des.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14708)
+++ branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14733)
@@ -1,14 +1,16 @@
 <inp2:m_CheckSSL/>
+<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">
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<inp2:lang.current_Field name='Locale' db='1'/>">
 
 <head>
-	<title><inp2:m_GetConfig name="Site_Name"/> &mdash; <inp2:st_PageInfo type="title"/></title>
-	<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 ##-->
+	<title><inp2:m_RenderElement name="page_title" default_element="default_cms_page_title" no_editing="1"/></title>
 
 	<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress from='all_css'/>" type="text/css" />
 	
@@ -24,27 +26,36 @@
 	<!--## System tag please do not remove ##-->
 	<inp2:st_EditPage mode="start"/>
 
-	<inp2:m_Include template="elements/header.elm" />	
-	<inp2:m_Include template="elements/menu.elm" />
-
-	<div id="content">
-		<div class="padding">
-		
-			<div class="leftcol">
-				<inp2:m_RenderElement name="sidebar" default_element="default_sidebar"/>
-			</div>
-		
-			<div class="contentcol">
-				<inp2:m_RenderElement name="content"/>
-			</div>
-			<div class="clear"></div>
+		<inp2:m_Include template="elements/header.elm" />	
+		<inp2:m_Include template="elements/menu.elm" />
+	
+		<div id="content">		
+			<div class="padding">
 			
+				<inp2:m_if check="m_Param" equals_to="2">
+			
+					<div class="leftcol">
+						<inp2:m_RenderElement name="sidebar" default_element="default_sidebar"/>
+					</div>
+				
+					<div class="contentcol">
+						<inp2:m_RenderElement name="content"/>
+					</div>
+					
+				<inp2:m_else/>
+				
+					<inp2:m_RenderElement name="content"/>
+					
+				</inp2:m_if>
+				
+				<div class="clear"></div>
+				
+			</div>
 		</div>
-	</div>
-
-	<inp2:m_Include template="elements/footer_menu.elm" />
 	
-	<inp2:m_Include template="elements/footer.elm" />
+		<inp2:m_Include template="elements/footer_menu.elm" />
+		
+		<inp2:m_Include template="elements/footer.elm" />
 
 	<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
 
