diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 85a8bc497e..6054c1cc16 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -67,7 +67,7 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
       if(commonModel::isTutorialMode())
       {
           $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
-          common::printIcon('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams", 'btn', 'button', 'plus', '', 'btn-bug-create', '', false, $lang->bug->create);
+          echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), "<i class='icon-plus'></i> {$lang->bug->create}",'', "class='btn btn-bug-create'");
       }
       else
       {
@@ -237,7 +237,7 @@ if($shortcut.size() > 0)
 }
 <?php endif;?>
 <?php $this->app->loadConfig('qa', '', false);?>
-<?php if($this->config->qa->homepage != 'browse'):?>
+<?php if(isset($this->config->qa->homepage) and $this->config->qa->homepage != 'browse'):?>
 $(function(){$('#modulemenu .nav li:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"qa\", \"browse\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")});
 <?php endif;?>
 </script>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 6047fb071d..233ee777a5 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -61,7 +61,7 @@
     if(commonModel::isTutorialMode())
     {
         $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
-        common::printIcon('tutorial', 'wizard', "module=story&method=create&params=$wizardParams", 'btn', 'button', 'plus', '', 'create-story-btn', false, '', $lang->story->create);
+        echo html::a($this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams"), "<i class='icon-plus'></i> {$lang->story->create}",'', "class='btn create-story-btn'");
     }
     else
     {
@@ -277,7 +277,7 @@ if($shortcut.size() > 0)
     $('#querybox').removeClass('show');
 }
 <?php endif;?>
-<?php if($this->config->product->homepage != 'browse'):?>
+<?php if(isset($this->config->product->homepage) and $this->config->product->homepage != 'browse'):?>
 $('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"product\", \"browse\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")
 <?php endif;?>
 </script>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 2fd705ca8b..6365ef3e9f 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -26,7 +26,7 @@
     if(commonModel::isTutorialMode())
     {
         $wizardParams = helper::safe64Encode("project=$project->id");
-        common::printIcon('tutorial', 'wizard', "module=project&method=linkStory&params=$wizardParams", '', 'button', 'link', '', 'link-story-btn', false, '', $lang->project->linkStory);
+        echo html::a($this->createLink('tutorial', 'wizard', "module=project&method=linkStory&params=$wizardParams"), "<i class='icon-link'></i> {$lang->project->linkStory}",'', "class='btn link-story-btn'");
     }
     else
     {
@@ -108,7 +108,7 @@
             if(commonModel::isTutorialMode())
             {
                 $wizardParams = helper::safe64Encode($param);
-                common::printIcon('tutorial', 'wizard', "module=task&method=create&params=$wizardParams", '', 'list', 'list-ul', '', 'btn-task-create', false, '', $lang->project->wbs);
+                echo html::a($this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-list-ul'></i>",'', "class='btn-icon btn-task-create' title='{$lang->project->wbs}'");
             }
             else
             {
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 589446a29b..fee3c4f15a 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -136,7 +136,7 @@ if($shortcut.size() > 0)
 <?php endif;?>
 statusActive = '<?php echo isset($lang->project->statusSelects[$this->session->taskBrowseType]);?>';
 if(statusActive) $('#statusTab').addClass('active')
-<?php if($this->config->project->homepage != 'browse'):?>
+<?php if(isset($this->config->project->homepage) and $this->config->project->homepage != 'browse'):?>
 $('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"project\", \"browse\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")
 <?php endif;?>
 </script>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 0ae05f3849..2440e2cc3a 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -23,7 +23,7 @@
       if(commonModel::isTutorialMode())
       {
           $wizardParams = helper::safe64Encode("projectID=$project->id");
-          common::printLink('tutorial', 'wizard', "module=project&method=managemembers&params=$wizardParams", $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'");
+          echo html::a($this->createLink('tutorial', 'wizard', "module=project&method=managemembers&params=$wizardParams"), $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'");
       }
       else
       {
diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php
index 3f745a08de..8cbd2a8b00 100644
--- a/module/tutorial/view/index.html.php
+++ b/module/tutorial/view/index.html.php
@@ -274,7 +274,6 @@ $(function()
                     var $required = $$('#' + requiredId);
                     if($required.length)
                     {
-                        console.log($required, $required.val());
                         var val = $required.val();
                         if(val === undefined || val === null || val === '')
                         {