Index: trunk/themes/default2007/platform/img/warning_icon.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/themes/default2007/platform/img/reviews.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/themes/default2007/platform/elements/side_boxes/login.tpl
===================================================================
diff -u -N -r8496 -r8514
--- trunk/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 8496)
+++ trunk/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 8514)
@@ -1,16 +1,25 @@
 <inp2:m_DefineElement name="header">
 	
-	<table>
+	<table class="fullwidth">
 		<tr>
 			<td class="side-title" align="left">
 				<inp2:m_phrase name="lu_title_LoginBox"/>
 			</td>
-			<td class="login-text" align="right">
-				<inp2:m_if check="m_LoggedIn">
-					<a href="<inp2:m_Link template="platform/my_account/my_profile" m_cat_id="0"/>"><inp2:u_Field name="FirstName"/> <inp2:u_Field name="LastName"/></a><br />
-				<inp2:m_else/>
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/not_logged.gif" alt="" align="absmiddle" width="11" height="11" border="0" /> <inp2:m_Phrase label="lu_NotLoggedIn"/>
-				</inp2:m_if>
+			<td align="right">
+					<inp2:m_if check="m_LoggedIn">
+						<a style="font-size:10px" href="<inp2:m_Link template="platform/my_account/my_profile" m_cat_id="0"/>"><inp2:u_Field name="FirstName"/> <inp2:u_Field name="LastName"/></a><br />
+					<inp2:m_else/>
+						<table>
+							<tr>
+								<td width="11">
+									<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/not_logged.gif" alt="" width="11" height="11" border="0" /><br />
+								</td>
+								<td class="login-text">
+									&nbsp;<inp2:m_Phrase label="lu_NotLoggedIn"/>
+								</td>								
+							</tr>
+						</table>
+					</inp2:m_if>
 			</td>			
 		</tr>
 	</table>
@@ -51,10 +60,10 @@
 		<inp2:m_ModuleInclude template="my_account/my_items"/>
 	</table>
 <inp2:m_else/>
-	<form method="POST" action="<inp2:m_FormAction />">
+	<form method="post" action="<inp2:m_FormAction />">
 		<inp2:m_if check="u_UseUsernames">
 			<inp2:m_phrase label="lu_username"/><br />
-			<input class="input-text" type="text" name="login" style="width:160px" /><br />
+			<input class="input-text" type="text" name="login" style="width:155px" /><br />
 		<inp2:m_else/>
 			<inp2:m_phrase label="lu_email"/><br />
 			<input class="input-text" type="text" name="email" /><br />
@@ -63,7 +72,7 @@
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
 
 		<inp2:m_Phrase label="lu_Password"/><br />
-		<input type="password" class="input-text" name="password" style="width:160px" /><br />
+		<input type="password" class="input-text" name="password" style="width:155px" /><br />
 		
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
 		
@@ -88,7 +97,7 @@
 		</inp2:m_if>
 
 		<a href="<inp2:m_Link template="platform/login/forgotpass" />" class="blue-small-link" ><inp2:m_Phrase label="lu_ForgotPassword"/>?</a>  <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" />
-		<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
+		<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
 		<input type="hidden" name="pending_disabled_template" value="platform/login/login_pending_disabled" />
 	</form>
 </inp2:m_if>
Index: trunk/themes/default2007/platform/elements/side_boxes/search.tpl
===================================================================
diff -u -N -r8496 -r8514
--- trunk/themes/default2007/platform/elements/side_boxes/search.tpl	(.../search.tpl)	(revision 8496)
+++ trunk/themes/default2007/platform/elements/side_boxes/search.tpl	(.../search.tpl)	(revision 8514)
@@ -5,7 +5,7 @@
 
 <form method="get" action="<inp2:m_Link template="in-commerce/search_results" />">
 	<inp2:m_GetFormHiddens template="in-commerce/search_results"/>
-	<input type="text" name="keywords" id="keywords" style="width: 160px" class="input-text" value="" /><br />
+	<input type="text" name="keywords" id="keywords" style="width: 155px" class="input-text" value="" /><br />
 
 	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
 	
Index: trunk/themes/default2007/platform/elements/header.tpl
===================================================================
diff -u -N -r8503 -r8514
--- trunk/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 8503)
+++ trunk/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 8514)
@@ -9,23 +9,23 @@
 				<tr>
 					<td class="languages-paddings">
 						<form method="post" name="lang_form" id="lang_form" action="<inp2:m_FormAction />">
-						<input type="hidden" name="events[lang][OnChangeLanguage]" value="">
-						<inp2:m_Phrase label="lu_YourLanguage"/>:
-						<select name="language" onchange="document.getElementById('lang_form').submit()">
-							<inp2:m_DefineElement name="lang_elem">
-								<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
-							</inp2:m_DefineElement>
-							<inp2:lang_ListLanguages render_as="lang_elem" row_start_render_as="html:" row_end_render_as="html:"/>
-						</select>
+							<input type="hidden" name="events[lang][OnChangeLanguage]" value="" />
+							<inp2:m_Phrase label="lu_YourLanguage"/>:
+							<select name="language" onchange="document.getElementById('lang_form').submit()">
+								<inp2:m_DefineElement name="lang_elem">
+									<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
+								</inp2:m_DefineElement>
+								<inp2:lang_ListLanguages render_as="lang_elem" row_start_render_as="html:" row_end_render_as="html:"/>
+							</select>
 						</form>						
 					</td>
 					<td width="1">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/languages_separator.gif" width="1" height="22" align="absmiddle" alt="" />
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/languages_separator.gif" width="1" height="22" alt="" />
 					</td>	
 					<td class="languages-paddings">
 						<form method="post" name="cur_form" id="cur_form" action="<inp2:m_FormAction />">
 							&nbsp; <inp2:m_Phrase label="lu_YourCurrency"/>:
-							<input type="hidden" name="events[curr][OnChangeCurrency]" value="">
+							<input type="hidden" name="events[curr][OnChangeCurrency]" value="" />
 							<select name="curr_iso" onchange="document.getElementById('cur_form').submit()">
 								<inp2:m_DefineElement name="currency">
 									<option value="<inp2:Field name="ISO"/>" <inp2:m_if check="SelectedCurrency">selected="selected"</inp2:m_if> ><inp2:Field name="ISO"/></option>
Index: trunk/themes/default2007/platform/designs/forms.tpl
===================================================================
diff -u -N -r8368 -r8514
--- trunk/themes/default2007/platform/designs/forms.tpl	(.../forms.tpl)	(revision 8368)
+++ trunk/themes/default2007/platform/designs/forms.tpl	(.../forms.tpl)	(revision 8514)
@@ -1,9 +1,24 @@
+<inp2:m_DefineElement name="error_message">
+	<table class="warning-cell fullwidth">
+		<tr>
+			<td width="30">
+				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
+			</td>
+			<td class="warning-cell">
+				<inp2:m_phrase name="lu_Warning"/>
+			</td>			
+		</tr>
+	</table>
+	<br />
+	<inp2:m_phrase name="lu_AProblemInForm"/><br />
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_field_caption">
 	<inp2:m_inc param="tab_index" by="1"/>
 	<td class="field-name">
 		<label for="<inp2:$prefix_InputName field="$field"/>">
-			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field">error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="error"> *</span></inp2:m_if>:
+			<span class="field-caption <inp2:m_if check="{$prefix}_HasError" field="$field">error</inp2:m_if>">
+			<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
 		</label>
 	</td>
 </inp2:m_DefineElement>
@@ -22,22 +37,36 @@
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
-			<input type="text" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
+	<tr>
+		<td colspan="2">
+			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_password" style="">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
-			<input type="password" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>			
+			<input type="password" class="input-text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
+	<tr>
+		<td colspan="2">
+			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>	
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_upload" style="">
@@ -48,28 +77,35 @@
 			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
 				(<inp2:$prefix_Field field="$field"/>)
 			</inp2:m_if>
-			<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>[upload]" value="<inp2:$prefix_Field field="$field"/>">
+			<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>[upload]" value="<inp2:$prefix_Field field="$field"/>" />
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_hidden" db="">
-	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>">
+	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>" />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date" class="" is_last="">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
-			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="{$field}_date"/></span><br />
+			</inp2:m_if>		
+			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
 			</script>
-			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="">
+			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="" />
 		</td>
-		<td class="error"><inp2:$prefix_Error field="{$field}_date"/>&nbsp;</td>
 	</tr>
+	<tr>
+		<td colspan="2">
+			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>	
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_time" class="">
@@ -79,7 +115,7 @@
 			<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>">&nbsp;
 			<span class="small">(<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
 			
-			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="">
+			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="" />
 		</td>
 		<td class="error"><inp2:$prefix_Error field="{$field}_time"/>&nbsp;</td>
 	</tr>
@@ -102,11 +138,14 @@
 
 <inp2:m_DefineElement name="inp_edit_textarea" style="">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<textarea tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:$prefix_Field field="$field"/></textarea>
+		<td class="field-value">		
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:$prefix_Field field="$field"/></textarea>
 		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -122,7 +161,7 @@
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
-			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
+			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
 				<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
 					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
 				<inp2:m_else/>
@@ -163,7 +202,7 @@
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td>
-			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>">
+			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>" />
 			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));">
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
 		</td>
Index: trunk/themes/default2007/platform/img/link_icon.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -N -r8503 -r8514
--- trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8503)
+++ trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8514)
@@ -13,7 +13,7 @@
 
 
 					<inp2:m_DefineElement name="menu_icon1">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_home.gif" width="23" height="20" align="absmiddle" alt="" />
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_home.gif" width="23" height="20" alt="" /><br />
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_icon1" strip_nl="2" result_to_var="menu_icon"/>
 			
@@ -45,7 +45,7 @@
 					<inp2:m_RenderElement name="menu_href10" strip_nl="2" result_to_var="menu_href"/>
 			
 					<inp2:m_DefineElement name="menu_icon10">
-						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_my_account.gif" align="absmiddle" alt="" />
+						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_my_account.gif" alt="" /><br />
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_icon10" strip_nl="2" result_to_var="menu_icon"/>			
 			
@@ -65,7 +65,7 @@
 					<inp2:m_RenderElement name="menu_href11" strip_nl="2" result_to_var="menu_href"/>
 			
 					<inp2:m_DefineElement name="menu_icon11">
-						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" align="absmiddle" alt="" />
+						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_icon11" strip_nl="2" result_to_var="menu_icon"/>			
 			
@@ -74,7 +74,7 @@
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_title11" strip_nl="2" result_to_var="menu_title"/>
 			
-					<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
+					<inp2:m_IsActive template="in-commerce/checkout/shopping_cart" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
 					<!-- // menu: ShoppingCart -->					
 				</tr>
Index: trunk/themes/default2007/platform/designs/content_boxes.tpl
===================================================================
diff -u -N -r8503 -r8514
--- trunk/themes/default2007/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 8503)
+++ trunk/themes/default2007/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 8514)
@@ -4,19 +4,23 @@
 			<td>
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_active_border.gif" width="1" height="37" alt=""/><br />
 			</td>		
-			<td class="menu-top-active">
-				<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_icon"/></a>&nbsp;
-				<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_title"/></a>
+			<td class="menu-top-active-icon">
+				<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_icon"/></a>
 			</td>
+			<td class="menu-top-active-text">
+				<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_title"/></a>
+			</td>			
 			<td>
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_active_border.gif" width="1" height="37" alt=""/><br />
 			</td>			
 		<inp2:m_else/>
 			<td>
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="37" alt=""/><br />
 			</td>
-			<td class="menu-top-noactive">
-				<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_icon"/></a>&nbsp;
+			<td class="menu-top-noactive-icon">
+				<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_icon"/></a>
+			</td>
+			<td class="menu-top-noactive-text">	
 				<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_title"/></a>
 			</td>
 			<td>
Index: trunk/themes/default2007/platform/my_account/my_profile.tpl
===================================================================
diff -u -N -r8478 -r8514
--- trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8478)
+++ trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8514)
@@ -16,39 +16,56 @@
 		</inp2:m_DefineElement>
 		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
 
+		
+		<span class="error">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
+		
 		<inp2:m_if check="u_HasError" field="any">
-			<span class="error"><inp2:m_phrase name="lu_AProblemInForm"/></span><br />
-		</inp2:m_if>
-
-		<span class="error">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br />
+			<inp2:m_RenderElement name="error_message" />
+		</inp2:m_if>		
+		
+		
 		<form method="post" action="<inp2:m_FormAction/>">
-			<table class="form-data">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+			<table class="form-data fullwidth">
+
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login"/>
 
 				<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
-					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password"/>
-					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword"/>
+					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
+					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
 				</inp2:m_if>
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email"/>
-				<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
 				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country"/>
 
 				<tr>
-					<td colspan="3" valign="bottom" height="35">
-						<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
+					<td colspan="2">
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
 					</td>
 				</tr>
+				<tr>
+					<td style="width:140px">
+						&nbsp;
+					</td>
+					<td>
+						<br />
+						<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
+						<br /><br />
+						
+					</td>					
+				</tr>
+
 			</table>
 		</form>
 	</inp2:m_DefineElement>
Index: trunk/themes/default2007/platform/designs/categories.tpl
===================================================================
diff -u -N -r8506 -r8514
--- trunk/themes/default2007/platform/designs/categories.tpl	(.../categories.tpl)	(revision 8506)
+++ trunk/themes/default2007/platform/designs/categories.tpl	(.../categories.tpl)	(revision 8514)
@@ -23,6 +23,7 @@
 				</td>
 			</tr>
 		</table>
+
 	</td>
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/login/register.tpl
===================================================================
diff -u -N -r8441 -r8514
--- trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8441)
+++ trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8514)
@@ -14,43 +14,58 @@
 		</inp2:m_DefineElement>
 		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
 
-		<inp2:u_PresetFormFields/>
+		<span class="error">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
+		
 		<inp2:m_if check="u_HasError" field="any">
-			<span class="error"><inp2:m_phrase name="lu_AProblemInForm"/></span><br />
+			<inp2:m_RenderElement name="error_message" />
 		</inp2:m_if>
-
-		<span class="error">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br />
+		
+		<inp2:u_PresetFormFields/>
 		<form method="post" action="<inp2:m_FormAction/>">
-			<table class="form-data">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login"/>
+		
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+			<table class="form-data fullwidth">
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
 
 				<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
-					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password"/>
-					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword"/>
+					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
+					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
 				</inp2:m_if>
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email"/>
-				<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip"/>
-				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
+				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" />
 
+
 				<tr>
-					<td colspan="3" valign="bottom" height="35">
+					<td colspan="2">
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
+					</td>
+				</tr>
+				<tr>
+					<td style="width:140px">
+						&nbsp;
+					</td>
+					<td>
+						<br />
 						<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
 						<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm" />
 						<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending" />
 
 						<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create"/>"/>
-					</td>
+						<br /><br />
+						
+					</td>					
 				</tr>
 			</table>
 		</form>