Index: branches/RC/themes/default2009/platform/designs/default_design.des.tpl
===================================================================
diff -u -r11490 -r11495
--- branches/RC/themes/default2009/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 11490)
+++ branches/RC/themes/default2009/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 11495)
@@ -6,8 +6,12 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" no_editing="1"/></title>
+		<inp2:m_DefineElement name="cms_page_title">
+			<inp2:st_PageInfo type="htmlhead_title"/>
+		</inp2:m_DefineElement>
 
+		<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
+
 		<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
 		<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
 
@@ -39,7 +43,16 @@
 							<!-- SIDEBAR -->
 							<td style="width: 200px;" valign="top">
 								<div class="groupWrapper">
-									<inp2:m_RenderElement name="sidebar" layout_view="1"/>
+									<inp2:m_DefineElement name="cms_sidebar">
+										<div class="movable-element">
+											<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+										</div>
+										<div class="movable-element">
+											<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+										</div>
+									</inp2:m_DefineElement>
+
+									<inp2:m_RenderElement name="sidebar" default_element="cms_sidebar" layout_view="1"/>
 								</div>
 							</td>
 							<!-- /SIDEBAR -->
@@ -53,7 +66,23 @@
 							<!-- CONTENT -->
 							<td style="width: auto;" valign="top">
 								<div class="groupWrapper">
-									<inp2:m_RenderElement name="content" layout_view="1"/>
+									<inp2:m_DefineElement name="cms_content">
+										<div class="movable-element">
+											<inp2:m_include template="platform/elements/navigation_bar.elm"/>
+										</div>
+
+										<div class="movable-element">
+											<inp2:m_RenderElement design="content_box">
+												<inp2:m_Capture to_var="header">
+													<inp2:st_PageInfo type="title"/><inp2:st_EditPage/>
+												</inp2:m_Capture>
+
+												<inp2:st_ContentBlock num="1"/>
+											</inp2:m_RenderElement>
+										</div>
+									</inp2:m_DefineElement>
+
+									<inp2:m_RenderElement name="content" default_element="cms_content" layout_view="1"/>
 								</div>
 								<br />
 							</td>
