Index: trunk/kernel/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -r4664 -r5037
--- trunk/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 4664)
+++ trunk/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 5037)
@@ -39,12 +39,15 @@
 	<inp2:m_inc param="tab_index" by="1"/>
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
-			<td colspan="3">
+			<td colspan="2">
 	    		<inp2:Field name="heading" as_label="1"/>
 	   		</td>
+	   		<td align="right">
+	   			<a class="config-header" href="javascript:toggle_section('<inp2:Field name="heading"/>');" id="toggle_mark[<inp2:Field name="heading"/>]" title="Collapse/Expand Section">[-]</a>
+	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
@@ -64,12 +67,15 @@
 	<inp2:m_inc param="tab_index" by="1"/>
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
-			<td colspan="3">
+			<td colspan="2">
 	    		<inp2:Field name="heading" as_label="1"/>
 	   		</td>
+	   		<td align="right">
+	   			<a class="config-header" href="javascript:toggle_section('<inp2:Field name="heading"/>');" id="toggle_mark[<inp2:Field name="heading"/>]" title="Collapse/Expand Section">[-]</a>
+	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">