Skip template expansion when html control does not have any chameleon tokens

Templates/html_controls.html.ep.xml

@@ -224,7 +224,7 @@
 				</tr>
 			</thead>
 			<tbody class='${classname}'>
-				% my $control_data = $self->stash('${TableControl}');
+				% my $control_data = $c->stash('${TableControl}');
 				% foreach my $row (@$control_data) {
 				<tr class='table-row'><tal:block tal:repeat="ColContent Columns">
 					<td class='sme-border table-col table-col-${ColContent}'><%=$c->render_to_string(inline=>$row->{'${ColContent}'})%></td></tal:block>		
@@ -243,12 +243,18 @@
 	</Preformatted>
 	
 	<Link><![CDATA[
-		%= link_to l('${title}'), '${structure:href}' , class=>'link link${type_serial}'
+		<a href='${structure:href}' class='link link${type_serial}'>
+			%= l('${title}')
+		</a>
+		%#= link_to l('${title}'), '${structure:href}' , class=>'link link${type_serial}'
 	]]>
 	</Link>
 
 	<ButtonLink><![CDATA[
-		%= button_to l('${title}'), '${structure:href}' , class=>'buttonlink buttonlink${type_serial}'
+		<button href='${structure:href}' class='buttonlink buttonlink${type_serial}'>
+			%= l('${title}')
+		</button>
+		%#= button_to l('${title}'), '${structure:href}' , class=>'buttonlink buttonlink${type_serial}'
 	]]>
 	</ButtonLink>
 
@@ -265,7 +271,7 @@
 	</Group>
 	
 	<Endgroup><![CDATA[
-		<div></div>
+		</div>
 		]]>
 	</Endgroup>