diff --git a/classes/breadcrumb.php b/classes/Breadcrumb.php
similarity index 84%
rename from classes/breadcrumb.php
rename to classes/Breadcrumb.php
index fd76f0f..bf4f3ad 100644
--- a/classes/breadcrumb.php
+++ b/classes/Breadcrumb.php
@@ -20,9 +20,13 @@ class Breadcrumb
 	/**
 	 * Breadcrumb Factory
 	 */
-	public static function factory()
+	public static function factory($title = '', $url = '')
 	{
-		return new Breadcrumb;
+		$crumb = new Breadcrumb();
+		$crumb->set_title($title);
+		$crumb->set_url($url);
+		
+		return $crumb;
 	}
 	
 	/**
diff --git a/classes/breadcrumb/exception.php b/classes/Breadcrumb/Exception.php
similarity index 100%
rename from classes/breadcrumb/exception.php
rename to classes/Breadcrumb/Exception.php
diff --git a/classes/breadcrumbs.php b/classes/Breadcrumbs.php
similarity index 87%
rename from classes/breadcrumbs.php
rename to classes/Breadcrumbs.php
index 71bf3c4..16d2af7 100644
--- a/classes/breadcrumbs.php
+++ b/classes/Breadcrumbs.php
@@ -42,6 +42,6 @@ public static function add(Breadcrumb $crumb)
 	 */
 	public static function render($template = "breadcrumbs/layout")
 	{
-		echo View::factory($template)->set('breadcrumbs', self::$breadcrumbs)->render();
+		return View::factory($template)->set('breadcrumbs', self::$breadcrumbs)->render();
 	}
 }
\ No newline at end of file
diff --git a/views/breadcrumbs/layout.php b/views/breadcrumbs/layout.php
index d2b8aaa..6177676 100644
--- a/views/breadcrumbs/layout.php
+++ b/views/breadcrumbs/layout.php
@@ -5,14 +5,14 @@
  * @author Kieran Graham
  */
 ?>
-<? if (count($breadcrumbs) > 0) : ?>
+<?php if (count($breadcrumbs) > 0) : ?>
 <ul id="breadcrumbs">
-<? foreach ($breadcrumbs as $crumb) : ?>
-<? if ($crumb->get_url() !== NULL) :  ?>
-	<li><a href="<?=$crumb->get_url()?>"><?=$crumb->get_title()?></a></li>
-<? else : ?>
-	<li><?=$crumb->get_title()?></li>
-<? endif; ?>
-<? endforeach; ?>
+<?php foreach ($breadcrumbs as $crumb) : ?>
+	<?php if ($crumb->get_url() !== NULL) :  ?>
+		<li><?php echo HTML::anchor($crumb->get_url(), $crumb->get_title()); ?></li>
+	<?php else : ?>
+		<li><?php echo $crumb->get_title()?></li>
+	<?php endif; ?>
+<?php endforeach; ?>
 </ul>
-<? endif; ?>
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file