diff --git a/include/text.php b/include/text.php
index be5e2338d..afd46f396 100755
--- a/include/text.php
+++ b/include/text.php
@@ -1835,16 +1835,17 @@ function json_decode_plus($s) {
 
 
 function design_tools() {
-// FIXME - this should be a template
+$channel = $channel  = get_app()->get_channel();
+$who = $channel['channel_address'];
 
-	$o = '<div class="widget design-tools">';
-	$o .= '<h3>' . t('Design') . '</h3>';
-	$o .= '<a href="blocks">' . t('Blocks') . '</a>' . EOL;
-	$o .= '<a href="menu">' . t('Menus') . '</a>' . EOL;
-	$o .= '<a href="layout">' . t('Layouts') . '</a>' . EOL;
-	$o .= '<a href="webpages">' . t('Pages') . '</a>' . EOL;
-	$o .= '</div>';
-	return $o;
+return replace_macros(get_markup_template('design_tools.tpl'), array(
+                        '$title' => t('Design'),
+			'$who' => $who,
+                      	'$blocks' => t('Blocks'),
+			'$menus' => t('Menus'),
+			'$layout' => t('Layouts'),
+			'$pages' => t('Pages')
+                        ));
 
 }
 
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
new file mode 100644
index 000000000..eb082dc37
--- /dev/null
+++ b/view/tpl/design_tools.tpl
@@ -0,0 +1,7 @@
+<div id="design-tools" class="widget design-tools">
+<h3>{{$title}}</h3>
+<li><a href="blocks/{{$who}}">{{$blocks}}</a></li>
+<li><a href="menu">{{$menus}}</a></li>
+<li><a href="layouts/{{$who}}">{{$layout}}</a></li>
+<li><a href="webpages/{{$who}}">{{$pages}}</a></li>
+</div>