Index: trunk/themes/default2007/platform/designs/content_boxes.tpl
===================================================================
diff -u -N -r8594 -r8797
--- trunk/themes/default2007/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 8594)
+++ trunk/themes/default2007/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 8797)
@@ -1,33 +1,31 @@
 <inp2:m_DefineElement name="menu_element" current="">
-
-		<inp2:m_if check="m_Param" name="current">
-			<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-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-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>
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="37" alt=""/><br />
-			</td>
-		</inp2:m_if>
-
+	<inp2:m_if check="m_Param" name="current">
+		<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-icon top-menu-padding">
+			<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_icon"/></a>
+		</td>
+		<td class="menu-top-active-text top-menu-padding">
+			<a href="<inp2:m_param name="menu_href"/>" class="top-menu-link"><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-icon top-menu-padding">
+			<a href="<inp2:m_param name="menu_href"/>"><inp2:m_param name="menu_icon"/></a>
+		</td>
+		<td class="menu-top-noactive-text top-menu-padding">
+			<a href="<inp2:m_param name="menu_href"/>" class="top-menu-link"><inp2:m_param name="menu_title"/></a>
+		</td>
+		<td>
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="37" alt=""/><br />
+		</td>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="box_element" prefix="">
@@ -86,8 +84,8 @@
 			<td width="13">
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
 			</td>
-			<td class="content-boxes-title">
-				<inp2:m_param name="header"/>
+			<td class="content-box-header">
+				<span class="content-box-title"><inp2:m_param name="header"/></span>
 			</td>
 			<td width="13">
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
@@ -97,7 +95,7 @@
 			<td width="13">
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
 			</td>
-			<td class="content-boxes-content">
+			<td class="content-box-content">
 				<inp2:m_param name="content"/>
 			</td>
 			<td width="13">