diff --git a/Asset/js/BoardDragAndDrop.js b/Asset/js/BoardDragAndDrop.js
index c208a77..b6b7b8c 100644
--- a/Asset/js/BoardDragAndDrop.js
+++ b/Asset/js/BoardDragAndDrop.js
@@ -44,7 +44,6 @@ Kanboard.BoardDragAndDrop.prototype.dragAndDrop = function() {
                 task.removeClass("draggable-item-selected");
 
                 if (newColumnId != taskColumnId || newSwimlaneId != taskSwimlaneId || newPosition != taskPosition) {
-                    console.log("Saving to " + saveURL + " [" + boardId+"]");
                     self.changeTaskState(taskId);
                     self.save(saveURL, boardId, taskId, taskColumnId, newColumnId, newPosition, newSwimlaneId);
                 }
diff --git a/Plugin.php b/Plugin.php
index c54e233..bb31af3 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -12,8 +12,11 @@ class Plugin extends Base
     public function initialize()
     {
       $this->template->hook->attach('template:project-list:menu:before', 'bigboard:Bigboard');
+      $this->template->setTemplateOverride('board/table_container','bigboard:board/table_container');
+      $this->template->setTemplateOverride('board/table_tasks','bigboard:board/table_tasks');
+      $this->template->setTemplateOverride('board/table_private','bigboard:board/table_private');
       $this->hook->on('template:layout:js', array('template' => 'plugins/Bigboard/Asset/js/BoardDragAndDrop.js'));
-      $this->hook->on('template:layout:js', array('template' => 'plugins/Bigboard/Asset/js/BoardPolling.js'));
+      $this->hook->on('template:layout:js', array('template' => 'plugins/Bigboard/Asset/js/BoardPolling.js'));      
     }
 
     public function getClasses()
@@ -23,7 +26,8 @@ public function getClasses()
           'UserSession'
         ),
         'Plugin\Bigboard\Controller' => array(
-          'Bigboard'
+          'Bigboard',
+          'BoardAjaxController'
         )
       );
     }
diff --git a/Template/board/table_container.php b/Template/board/table_container.php
index 2055449..e130f3f 100644
--- a/Template/board/table_container.php
+++ b/Template/board/table_container.php
@@ -10,10 +10,10 @@
                    class="board-project-<?= $project['id'] ?>"
                    data-project-id="<?= $project['id'] ?>"
                    data-check-interval="<?= $board_private_refresh_interval ?>"
-                   data-save-url="<?= $this->url->href('BoardAjaxController', 'save', array('project_id' => $project['id'])) ?>"
-                   data-reload-url="<?= $this->url->href('BoardAjaxController', 'reload', array('project_id' => $project['id'])) ?>"
-                   data-check-url="<?= $this->url->href('BoardAjaxController', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>"
-                   data-task-creation-url="<?= $this->url->href('TaskCreationController', 'show', array('project_id' => $project['id'])) ?>"
+                   data-save-url="<?= $this->url->href('BoardAjaxController', 'save', array('plugin' => "Bigboard", 'project_id' => $project['id'])) ?>"
+                   data-reload-url="<?= $this->url->href('BoardAjaxController', 'reload', array('plugin' => "Bigboard", 'project_id' => $project['id'])) ?>"
+                   data-check-url="<?= $this->url->href('BoardAjaxController', 'check', array('plugin' => "Bigboard", 'project_id' => $project['id'], 'timestamp' => time())) ?>"
+                   data-task-creation-url="<?= $this->url->href('TaskCreationController', 'show', array('plugin' => "Bigboard", 'project_id' => $project['id'])) ?>"
             >
         <?php endif ?>
 
@@ -42,7 +42,7 @@ class="board-project-<?= $project['id'] ?>"
                     )) ?>
                 <?php endif ?>
 
-                <?= $this->render('board/table_tasks', array(
+                <?= $this->render('bigboard:board/table_tasks', array(
                     'project' => $project,
                     'swimlane' => $swimlane,
                     'not_editable' => isset($not_editable),