--- trunk/lib/Frey/ClassBrowser.pm	2008/07/14 21:22:43	121
+++ trunk/lib/Frey/ClassBrowser.pm	2008/07/16 16:03:09	144
@@ -9,25 +9,24 @@
 our $markup;
 
 sub markup {
+	return $markup if $markup;
 	my $f = Frey::ClassLoader->new;
-	my $classes = dom2html(
-		table => [
-			map {
-				my $package = $_;
-				( tr => [
-					td => [ a => { href => '/~/' . $package, title => $f->package_path( $package ) } => [ $package ] ],
-					td => [
-						$package->can('meta') ?
-							$package->meta->isa('Moose::Meta::Role') ? 'role' :
-							( a => { href => '/od/' . $package } => [ 'design' ] ) :
-						''
-					],
-					td => [ $package->can('collection_table') ? ( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '' ],
-				] )
-			} $f->classes
-		],
-	);
-	$markup = $classes;
+	my $html;
+	foreach my $package ( $f->classes ) {
+		$html .= qq|<tr><td><a href="/~/$package" title="| . $f->package_path( $package ) . qq|">$package</a></td><td>|;
+		if ( $package->can('meta') ) {
+			if ( $package->meta->isa('Moose::Meta::Role') ) {
+				$html .= qq|role|;
+			} else {
+				$html .= qq|<a href="/od/$package">design</a>| if $package->can('collection');
+			}
+		}
+		$html .= qq|</td><td>|;
+		$html .= qq|<a href="/ob/$package">collection</a>| if $package->can('collection_table');
+		$html .= qq|</td></tr>|;
+	}
+	$html = "<table>$html</table>" if $html;
+	$markup = $html;
 }
 
 sub html {