diff --git a/recess/recess/apps/tools/views/apps/app.php b/recess/recess/apps/tools/views/apps/app.php
index 947134a..9bfa73e 100644
--- a/recess/recess/apps/tools/views/apps/app.php
+++ b/recess/recess/apps/tools/views/apps/app.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Applications - ' . $app->name;
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', $app->name);
 
 Library::import('recess.apps.tools.controllers.RecessToolsCodeController');
 $codeController = new RecessToolsCodeController($response->request->meta->app);
@@ -52,11 +51,9 @@ function printClassesInNamespace($namespace, $codeController) {
 <?php
 $routes = new RtNode();
 $app->addRoutesToRouter($routes);
-include_once($viewsDir . 'common/printRoutes.php');
-printRoutes($routes, $codeController);
+// include_once($viewsDir . 'common/printRoutes.php');
+Part::render('routes/table', $routes, $codeController, '');
 ?>
 
 <hr />
-<p>Trying to <a href="<?php echo $controller->urlTo('uninstall',get_class($app)); ?>">uninstall <?php echo $app->name; ?></a>?</p>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<p>Trying to <a href="<?php echo $controller->urlTo('uninstall',get_class($app)); ?>">uninstall <?php echo $app->name; ?></a>?</p>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/createModel.php b/recess/recess/apps/tools/views/apps/createModel.php
index 8f09480..705f1cc 100644
--- a/recess/recess/apps/tools/views/apps/createModel.php
+++ b/recess/recess/apps/tools/views/apps/createModel.php
@@ -1,9 +1,12 @@
 <?php
-$title = 'New Model Helper';
-$selectedNav = 'apps';
-$scripts = array('apps/newModelJQuery.php');
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', $app);
+
+Layout::block('scripts');
+include_once($viewsDir . 'apps/newModelJQuery.php');
+Layout::blockEnd();
 ?>
+
 <h1>New <strong>Model</strong> Helper</h1>
 <p>The purpose of this helper is to help speed the process of creating Recess Models. Please note <span class="highlight">this form is <strong>not</strong> child proof</span>!</p>
 <form class="modelForm" method="POST" action="<?php echo $controller->urlTo('generateModel',$app); ?>">
@@ -192,7 +195,4 @@
 <table style="visibility:hidden;">
 	<tbody id="relationTemplate">
 	</tbody>
-</table>
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/createModelComplete.php b/recess/recess/apps/tools/views/apps/createModelComplete.php
index 22e42c1..3244e5e 100644
--- a/recess/recess/apps/tools/views/apps/createModelComplete.php
+++ b/recess/recess/apps/tools/views/apps/createModelComplete.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'New Application Instructions';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'Model Created');
 ?>
 <h1>Creating <strong><?php echo $modelName; ?></strong> Model...</h1>
 
@@ -36,8 +35,4 @@
 <?php endif; ?>
 <h2><span class="highlight">Next Steps</span></h2>
 
-<h3><a href="<?php echo $controller->urlTo('generateScaffolding', $appName, $modelName); ?>">Generate Scaffolding</a> | <a href="<?php echo $controller->urlTo('app', $appName); ?>">Back to Code</a></h3>
-
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
\ No newline at end of file
+<h3><a href="<?php echo $controller->urlTo('generateScaffolding', $appName, $modelName); ?>">Generate Scaffolding</a> | <a href="<?php echo $controller->urlTo('app', $appName); ?>">Back to Code</a></h3>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/genController.php b/recess/recess/apps/tools/views/apps/genController.php
index 79efff4..b9e65d1 100644
--- a/recess/recess/apps/tools/views/apps/genController.php
+++ b/recess/recess/apps/tools/views/apps/genController.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Scaffolding Generation';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'Scaffolding Generation');
 ?>
 
 <h1>Select the Model to Generate Scaffolding for:</h1>
@@ -22,6 +21,4 @@ function printClassesInNamespace($namespace, $controller, $app) {
 </ul>
 
 <hr />
-<h2><a href="<?php echo $controller->urlTo('app', get_class($app)); ?>">Back to Application</a></h2>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h2><a href="<?php echo $controller->urlTo('app', get_class($app)); ?>">Back to Application</a></h2>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/generateScaffolding.php b/recess/recess/apps/tools/views/apps/generateScaffolding.php
index 0e82987..c75210a 100644
--- a/recess/recess/apps/tools/views/apps/generateScaffolding.php
+++ b/recess/recess/apps/tools/views/apps/generateScaffolding.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Scaffolding Generation';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'Scaffolding Generation');
 ?>
 
 <h1>Generating Scaffolding for <?php echo $modelName; ?>...</h1>
@@ -14,6 +13,4 @@
 ?>
 </pre>
 
-<h2><a href="<?php echo $controller->urlTo('app', $appName); ?>">Back to Application</a></h2>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h2><a href="<?php echo $controller->urlTo('app', $appName); ?>">Back to Application</a></h2>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/home.php b/recess/recess/apps/tools/views/apps/home.php
index 4bad434..2515dae 100644
--- a/recess/recess/apps/tools/views/apps/home.php
+++ b/recess/recess/apps/tools/views/apps/home.php
@@ -1,10 +1,9 @@
 <?php
-$title = 'Applications';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('Title', 'Home');
 ?>
-<h1>Applications</h1>
 
+<h1>Applications</h1>
 <?php
 if(isset($flash)) {
 	echo '<p class="highlight">' . $flash . '</p>';
@@ -26,6 +25,4 @@
 }
 ?>
 <hr />
-<h3><a href="<?php echo $controller->urlTo('newApp'); ?>">Start a New Application</a></h3>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h3><a href="<?php echo $controller->urlTo('newApp'); ?>">Start a New Application</a></h3>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/newAppInstructions.php b/recess/recess/apps/tools/views/apps/newAppInstructions.php
index b7fbac1..26d929d 100644
--- a/recess/recess/apps/tools/views/apps/newAppInstructions.php
+++ b/recess/recess/apps/tools/views/apps/newAppInstructions.php
@@ -1,13 +1,8 @@
 <?php
-$title = 'New Application Instructions';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'New App Instructions');
 ?>
 
 <h1>Your apps dir isn't writeable...</h1>
 
 <h2>Please make: <span class="highlight"><?php echo $_ENV['dir.apps']; ?></span> writeable and try again.</h2>
-
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/newAppWizard.php b/recess/recess/apps/tools/views/apps/newAppWizard.php
index 56cd3ea..97f73c4 100644
--- a/recess/recess/apps/tools/views/apps/newAppWizard.php
+++ b/recess/recess/apps/tools/views/apps/newAppWizard.php
@@ -1,10 +1,9 @@
 <?php
-$title = 'New Application Instructions';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
-
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'New Application Instructions');
 ?>
 
+
 <h1>New Application Walkthrough</h1>
 
 <p>Ready to start a new application? Great! This walkthrough is designed to step you through the process.</p>
@@ -21,8 +20,4 @@
 
 <input type="submit" value="Next Step" /><br /><br />
 
-<?php $form->end(); ?>
-
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
\ No newline at end of file
+<?php $form->end(); ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/newAppWizardComplete.php b/recess/recess/apps/tools/views/apps/newAppWizardComplete.php
index 72f65ad..c573b55 100644
--- a/recess/recess/apps/tools/views/apps/newAppWizardComplete.php
+++ b/recess/recess/apps/tools/views/apps/newAppWizardComplete.php
@@ -1,9 +1,8 @@
 <?php
-$title = 'New Application Instructions';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
-
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'New Application Instructions');
 ?>
+
 <h1>Creating New Application...</h1>
 
 <pre>
@@ -25,8 +24,4 @@
        );
 </pre>
 
-<h2><span class="highlight">Did you add that line?</span> Great! Have fun building <a href="<?php echo $controller->urlTo('app', $applicationClass); ?>"><?php echo $appName; ?></a>!</h2>
-
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
\ No newline at end of file
+<h2><span class="highlight">Did you add that line?</span> Great! Have fun building <a href="<?php echo $controller->urlTo('app', $applicationClass); ?>"><?php echo $appName; ?></a>!</h2>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/newAppWizardStep2.php b/recess/recess/apps/tools/views/apps/newAppWizardStep2.php
index 29aca2d..bc01144 100644
--- a/recess/recess/apps/tools/views/apps/newAppWizardStep2.php
+++ b/recess/recess/apps/tools/views/apps/newAppWizardStep2.php
@@ -1,10 +1,9 @@
 <?php
-$title = 'New Application Instructions';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
-
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'New Application');
 ?>
 
+
 <h1>New Application Walkthrough - Step 2</h1>
 
 <?php $form->begin(); ?>
@@ -19,8 +18,4 @@
 
 <input type="submit" value="Next Step" /><br /><br />
 
-<?php $form->end(); ?>
-
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
\ No newline at end of file
+<?php $form->end(); ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/newModelComplete.php b/recess/recess/apps/tools/views/apps/newModelComplete.php
index 46849de..15cfd58 100644
--- a/recess/recess/apps/tools/views/apps/newModelComplete.php
+++ b/recess/recess/apps/tools/views/apps/newModelComplete.php
@@ -1,8 +1,8 @@
 <?php
-$title = 'New Application Instructions';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'New Application');
 ?>
+
 <h1>Creating <strong><?php echo $modelName; ?></strong> Model...</h1>
 
 <h3 class="bottom">Code Gen <?php if($modelWasSaved){ echo '<span class="added">Done</a>'; } else { echo '<span class="highlight">Almost Done</span>'; } ?></h3>
@@ -29,9 +29,4 @@
 }
 ?></h3>
 
-
-<h2><span class="highlight">Next Steps</span></h2>
-
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
\ No newline at end of file
+<h2><span class="highlight">Next Steps</span></h2>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/newModelJQuery.php b/recess/recess/apps/tools/views/apps/newModelJQuery.php
index 242e530..9345ae9 100644
--- a/recess/recess/apps/tools/views/apps/newModelJQuery.php
+++ b/recess/recess/apps/tools/views/apps/newModelJQuery.php
@@ -219,4 +219,4 @@ function(data) {
 		
 	}
 </script>
-<script type="text/javascript" src="<?php echo $_ENV['url.content']; ?>js/jquery/jquery-1.2.6.js"></script> 
\ No newline at end of file
+<?php echo Html::js('jquery/jquery-1.2.6') ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/uninstall.php b/recess/recess/apps/tools/views/apps/uninstall.php
index 8cee22b..9a7f465 100644
--- a/recess/recess/apps/tools/views/apps/uninstall.php
+++ b/recess/recess/apps/tools/views/apps/uninstall.php
@@ -1,8 +1,8 @@
 <?php
-$title = 'Uninstall';
-$selectedNav = 'apps';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/apps');
+Layout::blockAssign('title', 'Uninstall');
 ?>
+
 <h1>To <span class="removed">Uninstall</span> <?php echo $app->name; ?>...</h1>
 <ol>
 	<li><span class="highlight">Open <?php echo $_ENV['dir.bootstrap']; ?>recess-conf.php</span></li>
@@ -13,5 +13,4 @@
 	<li><span class="highlight">Remove the string '<?php echo $appClass; ?>'</span></li>
 	<li>[Optional] Delete the directory <?php echo $_ENV['dir.apps'] . substr($appClass,0,strpos($appClass,'.')); ?></li>
 </ol>
-<h2>Th-Th-Th-Th-That's all folks. <a href="<?php echo $controller->urlTo('home'); ?>">Head back to apps.</a></h2>
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h2>That's all folks. <a href="<?php echo $controller->urlTo('home'); ?>">Head back to apps.</a></h2>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/code/byClass.php b/recess/recess/apps/tools/views/code/byClass.php
index 535afe9..ec8dd4b 100644
--- a/recess/recess/apps/tools/views/code/byClass.php
+++ b/recess/recess/apps/tools/views/code/byClass.php
@@ -1,8 +1,8 @@
 <?php
-$title = 'Browsing Code by Package';
-$selectedNav = 'code';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/code');
+Layout::blockAssign('title', 'By Class');
 ?>
+
 <h1>Browse Code by Class</h1>
 
 <table>
@@ -24,5 +24,4 @@
 	echo '</tr>';
 }
 ?>
-</table>
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/code/byPackage.php b/recess/recess/apps/tools/views/code/byPackage.php
index 1c29d21..0b4ffa7 100644
--- a/recess/recess/apps/tools/views/code/byPackage.php
+++ b/recess/recess/apps/tools/views/code/byPackage.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Browsing Code by Package';
-$selectedNav = 'code';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/code');
+Layout::blockAssign('title', 'By Package');
 ?>
 
 <h1>Browse Code by Package</h1>
@@ -10,6 +9,4 @@
 <?php foreach($packages as $package): ?>
 	<li><?php echo $package->name; ?></li>
 <?php endforeach; ?>
-</ul>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+</ul>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/code/classInfo.php b/recess/recess/apps/tools/views/code/classInfo.php
index 259107a..de16645 100644
--- a/recess/recess/apps/tools/views/code/classInfo.php
+++ b/recess/recess/apps/tools/views/code/classInfo.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Model ' . $reflection->name;
-$selectedNav = 'code';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/code');
+Layout::blockAssign('title', 'Class ' . $reflection->name);
 ?>
 
 <?php
@@ -95,10 +94,6 @@ function printModelInfo($table, $source, $relationships, $columns) {
 
 </div>
 
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
-
 <?php
 // Print Methods
 
diff --git a/recess/recess/apps/tools/views/code/home.php b/recess/recess/apps/tools/views/code/home.php
index 2dd52c8..86a8aee 100644
--- a/recess/recess/apps/tools/views/code/home.php
+++ b/recess/recess/apps/tools/views/code/home.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Code Browsing';
-$selectedNav = 'code';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/code');
+Layout::blockAssign('title', 'Code Browser');
 ?>
 <h1>Code Browser</h1>
 <?php if(count($packages) == 0):?>
@@ -35,5 +34,4 @@ function printTable($controller, $objects, $columns = 4) {
 }
 ?>
 
-<a href="<?php echo $controller->urlTo('index'); ?>">Re-index your Code</a>
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<a href="<?php echo $controller->urlTo('index'); ?>">Re-index your Code</a>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/code/packageInfo.php b/recess/recess/apps/tools/views/code/packageInfo.php
index 9628e97..7edd66c 100644
--- a/recess/recess/apps/tools/views/code/packageInfo.php
+++ b/recess/recess/apps/tools/views/code/packageInfo.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Package ' . $package->name; 
-$selectedNav = 'code';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/code');
+Layout::blockAssign('title', $package->name);
 ?>
 <?php
 
diff --git a/recess/recess/apps/tools/views/common/header.php b/recess/recess/apps/tools/views/common/header.php
index 59c6b78..b6b87c2 100644
--- a/recess/recess/apps/tools/views/common/header.php
+++ b/recess/recess/apps/tools/views/common/header.php
@@ -38,4 +38,4 @@
 				<p class="qotm quiet">"Give us the tools, and we'll finish the job." ~Churchill</p>
 			</div>
 			<div class="span-19">
-				<?php include_once($viewsDir . 'common/navbar.php'); ?>
\ No newline at end of file
+				<?php include($viewsDir . 'common/navbar.php'); ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/database/dropTable.php b/recess/recess/apps/tools/views/database/dropTable.php
index d00119a..a73761c 100644
--- a/recess/recess/apps/tools/views/database/dropTable.php
+++ b/recess/recess/apps/tools/views/database/dropTable.php
@@ -1,15 +1,11 @@
 <?php
-$title = 'Data Sources - Drop ' . $tableName;
-$selectedNav = 'database';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/database');
+Layout::blockAssign('title', 'Drop ' . $tableName);
 ?>
-
 <h1><span class="highlight">Drop "<?php echo $tableName; ?>" table</span>?</h1>
 <h2><a href="<?php echo $controller->urlTo('showTable', $sourceName, $tableName); ?>">No, Just Kidding, Take Me Back</a></h2>
 
 <h2>This action cannot be undone.</h2>
 <form method="POST" action="<?php echo $controller->urlTo('dropTablePost',$sourceName,$tableName); ?>">
 	<input class="removed" type="submit" name="confirm" value="Yes, Drop it!" />
-</form>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/database/emptyTable.php b/recess/recess/apps/tools/views/database/emptyTable.php
index cc83685..2d5a88f 100644
--- a/recess/recess/apps/tools/views/database/emptyTable.php
+++ b/recess/recess/apps/tools/views/database/emptyTable.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Data Sources - Empty ' . $tableName;
-$selectedNav = 'database';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/database');
+Layout::blockAssign('title', 'Empty ' . $tableName);
 ?>
 
 <h1><span class="highlight">Empty "<?php echo $tableName; ?>" table</span>?</h1>
@@ -10,6 +9,4 @@
 <h2>This action cannot be undone.</h2>
 <form method="POST" action="<?php echo $controller->urlTo('emptyTablePost',$sourceName,$tableName); ?>">
 	<input class="removed" type="submit" name="confirm" value="Yes, Empty it!" />
-</form>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/database/home.php b/recess/recess/apps/tools/views/database/home.php
index b55d526..395d83f 100644
--- a/recess/recess/apps/tools/views/database/home.php
+++ b/recess/recess/apps/tools/views/database/home.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Data Sources';
-$selectedNav = 'database';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/database');
+Layout::blockAssign('title', 'Home');
 ?>
 <h1>Data Sources</h1>
 <hr />
@@ -19,5 +18,4 @@
 	</div>
 	<hr />
 <?php endforeach; ?>
-<h3><a href="<?php echo $controller->urlTo('newSource'); ?>">Add another Data Source</a></h3>
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h3><a href="<?php echo $controller->urlTo('newSource'); ?>">Add another Data Source</a></h3>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/database/newSource.php b/recess/recess/apps/tools/views/database/newSource.php
index 439e377..3e54c88 100644
--- a/recess/recess/apps/tools/views/database/newSource.php
+++ b/recess/recess/apps/tools/views/database/newSource.php
@@ -1,7 +1,6 @@
 <?php
-$title = 'Data Sources';
-$selectedNav = 'database';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/database');
+Layout::blockAssign('title', 'New Data Source');
 ?>
 <h1>Adding a New Named Data Source</h1>
 <p>Recess allows for multiple named data sources. Currently only MySQL and Sqlite are supported.</p>
@@ -34,10 +33,5 @@
 	</li>
 	<li>Save.</li>
 </ol>
-
-
-
-
 <hr />
-<h3><a href="<?php echo $controller->urlTo('home'); ?>">Return to Data Sources</a></h3>
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h3><a href="<?php echo $controller->urlTo('home'); ?>">Return to Data Sources</a></h3>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/database/showTable.php b/recess/recess/apps/tools/views/database/showTable.php
index 58e2916..5460f66 100644
--- a/recess/recess/apps/tools/views/database/showTable.php
+++ b/recess/recess/apps/tools/views/database/showTable.php
@@ -1,9 +1,7 @@
 <?php
-$title = 'Data Sources - ' . $sourceName . ':' . $table;
-$selectedNav = 'database';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/database');
+Layout::blockAssign('title', $sourceName . ':' . $table);
 ?>
-
 <h1>Table: <strong><?php echo $table;?></strong></h1>
 <h2>Source: <?php echo $sourceName;?></h2>
 <h2>Columns:</h2>
@@ -39,5 +37,4 @@
 </tbody>
 </table>
 <hr />
-<h3><a href="<?php echo $controller->urlTo('emptyTable',$sourceName,$table); ?>">Empty Table</a> - <a href="<?php echo $controller->urlTo('dropTable', $sourceName, $table); ?>">Drop Table</a></h3>
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h3><a href="<?php echo $controller->urlTo('emptyTable',$sourceName,$table); ?>">Empty Table</a> - <a href="<?php echo $controller->urlTo('dropTable', $sourceName, $table); ?>">Drop Table</a></h3>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/home/home.php b/recess/recess/apps/tools/views/home/home.php
index 2422458..8c37c4e 100644
--- a/recess/recess/apps/tools/views/home/home.php
+++ b/recess/recess/apps/tools/views/home/home.php
@@ -1,8 +1,5 @@
-<?php
-$title = 'Recess Tools! - Home';
-$selectedNav = '';
-include_once($viewsDir . 'common/header.php');
-?>
+<?php Layout::extend('layouts/home'); ?>
+<?php Layout::blockAssign('title', 'Welcome'); ?>
 
 <h1>Welcome to Recess</h1>
 
@@ -32,6 +29,4 @@
 As Recess matures the tool set will need to grow too. Have ideas for other useful tools? Perhaps you've built additional useful tools? Get involved over at <a href="http://www.recessframework.org/">RecessFramework.org</a>.
 </p>
 
-<h3>Enjoy!<br />-<a href="http://www.krisjordan.com/">Kris</a></h3>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h3>Enjoy!<br />-<a href="http://www.krisjordan.com/">Kris</a></h3>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/apps.php b/recess/recess/apps/tools/views/layouts/apps.php
new file mode 100644
index 0000000..961cd50
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/apps.php
@@ -0,0 +1,9 @@
+<?php 
+Layout::extend('layouts/master');
+
+Layout::slotAppend('title', ' > Apps > ');
+
+Layout::block('navigation');
+	Part::render('layouts/navigation', 'Apps');
+Layout::blockEnd() ;
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/code.php b/recess/recess/apps/tools/views/layouts/code.php
new file mode 100644
index 0000000..0a4924e
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/code.php
@@ -0,0 +1,9 @@
+<?php 
+Layout::extend('layouts/master');
+
+Layout::slotAppend('title', ' > Code > ');
+
+Layout::block('navigation');
+	Part::render('layouts/navigation', 'Code');
+Layout::blockEnd() ;
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/database.php b/recess/recess/apps/tools/views/layouts/database.php
new file mode 100644
index 0000000..68c38c0
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/database.php
@@ -0,0 +1,9 @@
+<?php 
+Layout::extend('layouts/master');
+
+Layout::slotAppend('title', ' > Database > ');
+
+Layout::block('navigation');
+	Part::render('layouts/navigation', 'Database');
+Layout::blockEnd() ;
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/home.php b/recess/recess/apps/tools/views/layouts/home.php
new file mode 100644
index 0000000..3c01746
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/home.php
@@ -0,0 +1,7 @@
+<?php 
+Layout::extend('master');
+Layout::slotAppend('title', ' > Home > ');
+Layout::block('navigation');
+	Part::render('layouts/navigation', '');
+Layout::blockEnd() ;
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/master.php b/recess/recess/apps/tools/views/layouts/master.php
new file mode 100644
index 0000000..8e9c697
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/master.php
@@ -0,0 +1,56 @@
+<html>
+	<head>
+		<!-- Blue Print -->
+		<?php echo Html::css('blueprint/screen', 'screen'); ?>
+		<?php echo Html::css('blueprint/print', 'print'); ?>
+		<!--[if IE]>
+			<?php echo Html::css('blueprint/ie', 'screen'); ?>
+		<![endif]-->
+		<?php echo Html::css('recess'); ?>
+		 
+		<?php
+		echo Html::css('SyntaxHighlighter');
+		echo Html::js('shCore');
+		echo Html::js('shBrushPhp');
+		echo Html::js('shBrushSql'); 
+		?>
+		<script language="javascript">
+			window.onload = function() {
+				dp.SyntaxHighlighter.ClipboardSwf = '<?php echo Url::base('flash/clipboard.swf') ?>'
+				dp.SyntaxHighlighter.HighlightAll('code');
+			}
+		</script>
+		<?php Layout::slot('scripts') ?><?php Layout::slotEnd() ?>
+		<title>Recess Tools!<?php Layout::slot('title') ?><?php Layout::slotEnd() ?></title>
+	</head>
+	<body>
+	<div class="container">
+			<div class="span-11 header">
+				<h1>Recess Tools</h1>
+			</div>
+			<div class="span-13 last">
+				<p class="qotm quiet">"Give us the tools, and we'll finish the job." ~Churchill</p>
+			</div>
+			<div class="span-19">
+				<?php Layout::slot('navigation') ?>
+				<?php Layout::slotEnd() ?>
+				<?php Layout::slot('body') ?>
+				<?php Layout::slotEnd() ?>
+			</div>
+			<div class="span-5 last infobar">
+			  <h3><span>Recess Resources</span></h3>
+			  <ul>
+				<li><a href="http://www.recessframework.org/">RecessFramework.org</a></li>
+				<li><a href="http://www.recessframework.org/blog">Recess Blog</a></li>
+				<li><a href="http://www.krisjordan.com/">Kris' Blog</a></li>
+				<li><a href="http://groups.google.com/group/recess-framework">Mailing Group</a></li>
+				<li><a href="http://recess.lighthouseapp.com/">Report Bugs</a></li>
+				<li><a href="http://github.com/recess/recess/">Recess Source</a></li>
+			  </ul>
+			</div>
+			<div class="span-24 footer">
+			  <p class="quiet bottom"><a href="http://www.recessframework.org/">Recess PHP Framework</a> is &copy; 2008 <a href="http://www.krisjordan.com/">Kris Jordan</a>. All rights reserved. Recess is open source under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a>.</p>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/navigation.part.php b/recess/recess/apps/tools/views/layouts/navigation.part.php
new file mode 100644
index 0000000..248a0a0
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/navigation.part.php
@@ -0,0 +1,20 @@
+<?php
+/*== Part Inputs ==*/
+// selected: The name of the selected navigation item
+assert(is_string($selected));
+/*=================*/
+
+function printNavItem($action, $display, $selectedUrl) {
+	if($selectedUrl == $display) $liClass = ' class="highlight"';
+	else $liClass = '';
+	echo '<li' . $liClass . '>' . Html::anchor(Url::action($action),$display) . '</li>';
+}
+?>
+<div class="span-19 navigation last">
+	<ul>
+	<?php printNavItem('RecessToolsAppsController::home', 'Apps', $selected) ?>
+	<?php printNavItem('RecessToolsDatabaseController::home', 'Database', $selected) ?>
+	<?php printNavItem('RecessToolsCodeController::home', 'Code', $selected) ?>
+	<?php printNavItem('RecessToolsRoutesController::home', 'Routes', $selected) ?>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/routes.php b/recess/recess/apps/tools/views/layouts/routes.php
new file mode 100644
index 0000000..45b4849
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/routes.php
@@ -0,0 +1,9 @@
+<?php 
+Layout::extend('layouts/master');
+
+Layout::slotAppend('title', ' > Routes > ');
+
+Layout::block('navigation');
+	Part::render('layouts/navigation', 'Routes');
+Layout::blockEnd() ;
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/routes/home.php b/recess/recess/apps/tools/views/routes/home.php
index 741d0ed..406b325 100644
--- a/recess/recess/apps/tools/views/routes/home.php
+++ b/recess/recess/apps/tools/views/routes/home.php
@@ -1,16 +1,15 @@
 <?php
-$title = 'Routes';
-$selectedNav = 'routes';
-include_once($viewsDir . 'common/header.php');
+Layout::extend('layouts/routes');
+Layout::blockAssign('title', 'Home');
 ?>
 <h2 class="bottom">Routes</h2>
 <?php
-include_once($viewsDir . 'common/printRoutes.php');
+//include_once($viewsDir . 'common/printRoutes.php');
 $routes = RecessConf::getRoutes();
 
 Library::import('recess.apps.tools.controllers.RecessToolsCodeController');
 $codeController = new RecessToolsCodeController($response->request->meta->app);
 
-printRoutes($routes, $codeController, '/recess');
-?>
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+// printRoutes($routes, $codeController, '/recess');
+Part::render('routes/table', $routes, $codeController, '/recess');
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/routes/rows.part.php b/recess/recess/apps/tools/views/routes/rows.part.php
new file mode 100644
index 0000000..b877eb1
--- /dev/null
+++ b/recess/recess/apps/tools/views/routes/rows.part.php
@@ -0,0 +1,40 @@
+<?php
+assert($routingNode instanceof RtNode);
+assert($codeController instanceof Controller);
+assert(is_string($fullPath));
+assert(is_string($omit));
+
+if($omit != '' && strpos($fullPath, $omit) === 0) {
+	return;
+}
+
+if($routingNode == null) return;
+$staticPaths = $routingNode->getStaticPaths();
+$parametricPaths = $routingNode->getParametricPaths();
+$methods = $routingNode->getMethods();
+if(!empty($methods)) {
+	foreach($methods as $method => $rt): 
+		$route = $rt->toRoute();
+		?>
+		<tr>
+		<td><?php echo $method ?></td>
+		<td><?php echo $fullPath ?></td>
+		<td><?php echo Html::anchor(Url::action('RecessToolsCodeController::classInfo', $route->class), Library::getClassName($route->class)); ?></td>
+		<td><?php echo Html::anchor(Url::action('RecessToolsCodeController::classInfo', $route->class) . '#method_' . $route->function, $route->function) ?></td>
+		</tr>
+	<?php 
+	endforeach;
+} 
+
+if(!empty($staticPaths) || !empty($parametricPaths)) {
+	ksort($staticPaths);
+	ksort($parametricPaths);
+	foreach($staticPaths as $path => $node) {
+		Part::render('routes/rows', $node, $codeController, $fullPath . '/' . $path, $omit);
+	}
+	foreach($parametricPaths as $path => $node) {
+		Part::render('routes/rows', $node, $codeController, $fullPath . '/$' . $path, $omit);
+	}
+}
+?>
+
diff --git a/recess/recess/apps/tools/views/routes/table.part.php b/recess/recess/apps/tools/views/routes/table.part.php
new file mode 100644
index 0000000..980d8a8
--- /dev/null
+++ b/recess/recess/apps/tools/views/routes/table.part.php
@@ -0,0 +1,15 @@
+<?php
+assert($routes instanceof RtNode);
+assert($codeController instanceof Controller);
+assert(is_string($omit));
+
+$fullPath = $_ENV['url.base'];
+if(strrpos($fullPath, '/') == strlen($fullPath) - 1) $fullPath = substr($fullPath,0,-1);
+if(!isset($omit)) $omit = '';
+?>
+<table>
+<thead><td>HTTP</td><td>Route</td><td>Controller</td><td>Method</td></thead>
+<tbody>
+	<?php Part::render('routes/rows', $routes, $codeController, $fullPath, $omit) ?>
+</tbody>
+</table>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/Layout.class.php b/recess/recess/framework/helpers/Layout.class.php
index bfd114d..66f942c 100644
--- a/recess/recess/framework/helpers/Layout.class.php
+++ b/recess/recess/framework/helpers/Layout.class.php
@@ -54,6 +54,12 @@ public static function blockEnd() {
 		}
 	}
 	
+	public static function blockAssign($title, $value) {
+		self::block($title);
+		echo $value;
+		self::blockEnd();
+	}
+	
 	public static function slot($title) {
 		if(!empty(self::$slotStack)) {
 			die('can\'t nest slots');
@@ -78,6 +84,14 @@ public static function slotEnd() {
 		}
 	}
 	
+	public static function slotAppend($title, $value) {
+		self::block($title);
+		echo $value;
+		self::slot($title);
+		self::slotEnd();
+		self::blockEnd();
+	}
+	
 	public static function extendEnd() {
 		if(!empty(self::$extendStack)) {
 			if(!isset(self::$blockMap[Layout::DEFAULT_BLOCK])) {
diff --git a/recess/recess/framework/helpers/Part.class.php b/recess/recess/framework/helpers/Part.class.php
new file mode 100644
index 0000000..ff98f4d
--- /dev/null
+++ b/recess/recess/framework/helpers/Part.class.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @todo Exception handling
+ * 
+ * @author Kris
+ */
+class Part extends AbstractHelper {
+	
+	protected static $app;
+	
+	protected static $loaded = array();
+	
+	public static function init($view) {
+		$response = $view->getResponse();
+		self::$app = $response->meta->app;
+	}
+	
+	public static function render() { 
+		$args = func_get_args();
+		$templateFile = self::$app->getViewsDir() . $args[0] . '.part.php';
+	
+		if(!isset(self::$loaded[$templateFile])) {
+			$template = file_get_contents($templateFile);
+			
+			preg_match_all("/assert(?:\W*)\\((?:\W*)(?:is_(.*?)(?:\W*)\\((?:\W*)\\$(.*?)(?:\W*)\\)|\\$(\\w*?)(?:\W*)instanceof(?:\W*)(\\w*?))(?:\W*)\\)(?:\W*);/",
+							$template,
+							$matches);
+			
+			$parameters = array();
+			foreach($matches[0] as $key => $value) {
+				if(isset($matches[1][$key]) && $matches[1][$key] != '') {
+					$parameters[$matches[2][$key]] = $matches[1][$key];
+				} else if (isset($matches[3][$key])) {
+					$parameters[$matches[3][$key]] = $matches[4][$key];
+				}
+			}
+			
+			self::$loaded[$templateFile] = $parameters;
+		}
+		
+		$parameters = self::$loaded[$templateFile];
+		$keys = array_keys($parameters);
+		array_unshift($keys, '');
+		$params = array_combine($keys, $args);
+		extract($params);
+		include($templateFile);
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/views/RecessView.class.php b/recess/recess/framework/views/RecessView.class.php
index e787770..e609eef 100644
--- a/recess/recess/framework/views/RecessView.class.php
+++ b/recess/recess/framework/views/RecessView.class.php
@@ -17,6 +17,7 @@ class RecessView extends NativeView {
 	protected function render(Response $response) {
 		$this->loadHelper(
 						'recess.framework.helpers.Layout',
+						'recess.framework.helpers.Part',
 						'recess.framework.helpers.Url',
 						'recess.framework.helpers.Html');
 		parent::render($response);