diff --git a/Plugin.php b/Plugin.php
index 530eae4..8d350d1 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -10,7 +10,8 @@ class Plugin extends Base
     public function initialize()
     {
         $this->template->hook->attach('template:user:integrations', 'StarredProjects:user/integrations');
-        $this->template->setTemplateOverride('dashboard/overview', 'StarredProjects:dashboard/overview');
+        $this->template->hook->attach('template:dashboard:show:after-filter-box','StarredProjects:dashboard/starred-projects');
+        $this->template->hook->attach('template:dashboard:project:before-title','StarredProjects:dashboard/projects');
         $this->template->setTemplateOverride('header/board_selector', 'StarredProjects:header/board_selector');
         $this->hook->on('template:layout:js', array('template' => 'plugins/StarredProjects/assets/js/starred-projects.js'));
         $this->hook->on('template:layout:css', array('template' => 'plugins/StarredProjects/assets/css/starred-projects.css'));
diff --git a/Template/dashboard/overview.php b/Template/dashboard/overview.php
deleted file mode 100644
index edba5db..0000000
--- a/Template/dashboard/overview.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php $this->asset->js('plugins/StarredProjects/assets/js/starred-projects.js') ?>
-<div class="filter-box margin-bottom">
-    <form method="get" action="<?= $this->url->dir() ?>" class="search">
-        <?= $this->form->hidden('controller', array('controller' => 'SearchController')) ?>
-        <?= $this->form->hidden('action', array('action' => 'index')) ?>
-
-        <div class="input-addon">
-            <?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'input-addon-field') ?>
-            <div class="input-addon-item">
-                <?= $this->render('app/filters_helper') ?>
-            </div>
-        </div>
-    </form>
-</div>
-
-<?php $starredProjects = $this->app->starredProjectsModel->findAllProjects($this->user->getId()); ?>
-<?php if(!empty($starredProjects)): ?>
-    <div class="table-list">
-        <div class="table-list-header">
-            <div class="table-list-header-count"><?= t('Starred projects') ?></div>
-            <div class="table-list-header-menu">&nbsp;</div>
-        </div>
-        <?php foreach ($starredProjects as $project): ?>
-            <div class="table-list-row table-border-left">
-                <div>
-                    <?php if ($this->user->hasProjectAccess('ProjectViewController', 'show', $project['id'])): ?>
-                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
-                    <?php else: ?>
-                        <strong><?= '#'.$project['id'] ?></strong>
-                    <?php endif ?>
-
-                    <span class="star-project" data-url="<?= $this->url->href('StarredProjectsController', 'starProject', array('plugin' => 'StarredProjects', 'project_id' => $project['id'])) ?>">
-                        <?php if($this->app->starredProjectsModel->find($project['id'], $this->user->getId())): ?>
-                            ★
-                        <?php else: ?>
-                            ☆
-                        <?php endif; ?>
-                    </span>
-
-                    <span class="table-list-title <?= $project['is_active'] == 0 ? 'status-closed' : '' ?>">
-                        <?= $this->url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?>
-                    </span>
-
-                    <?php if ($project['is_private']): ?>
-                        <i class="fa fa-lock fa-fw" title="<?= t('Private project') ?>"></i>
-                    <?php endif ?>
-                </div>
-            </div>
-        <?php endforeach; ?>
-    </div>
-<?php endif; ?>
-
-<?php if (! $project_paginator->isEmpty()): ?>
-    <div class="table-list">
-        <?= $this->render('project_list/header', array('paginator' => $project_paginator)) ?>
-        <?php foreach ($project_paginator->getCollection() as $project): ?>
-            <div class="table-list-row table-border-left">
-                <div>
-                    <?php if ($this->user->hasProjectAccess('ProjectViewController', 'show', $project['id'])): ?>
-                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
-                    <?php else: ?>
-                        <strong><?= '#'.$project['id'] ?></strong>
-                    <?php endif ?>
-
-                    <span class="star-project" data-url="<?= $this->url->href('StarredProjectsController', 'starProject', array('plugin' => 'StarredProjects', 'project_id' => $project['id'])) ?>">
-                        <?php if($this->app->starredProjectsModel->find($project['id'], $this->user->getId())): ?>
-                            ★
-                        <?php else: ?>
-                            ☆
-                        <?php endif; ?>
-                    </span>
-
-                    <span class="table-list-title <?= $project['is_active'] == 0 ? 'status-closed' : '' ?>">
-                        <?= $this->url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?>
-                    </span>
-
-                    <?php if ($project['is_private']): ?>
-                        <i class="fa fa-lock fa-fw" title="<?= t('Private project') ?>"></i>
-                    <?php endif ?>
-                </div>
-                <div class="table-list-details">
-                    <?php foreach ($project['columns'] as $column): ?>
-                        <strong title="<?= t('Task count') ?>"><?= $column['nb_open_tasks'] ?></strong>
-                        <small><?= $this->text->e($column['title']) ?></small>
-                    <?php endforeach ?>
-                </div>
-            </div>
-        <?php endforeach ?>
-    </div>
-
-    <?= $project_paginator ?>
-<?php endif ?>
-
-<?php if (empty($overview_paginator)): ?>
-    <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
-<?php else: ?>
-    <?php foreach ($overview_paginator as $result): ?>
-        <?php if (! $result['paginator']->isEmpty()): ?>
-            <div class="page-header">
-                <h2 id="project-tasks-<?= $result['project_id'] ?>"><?= $this->url->link($this->text->e($result['project_name']), 'BoardViewController', 'show', array('project_id' => $result['project_id'])) ?></h2>
-            </div>
-
-            <div class="table-list">
-                <?= $this->render('task_list/header', array(
-                    'paginator' => $result['paginator'],
-                )) ?>
-
-                <?php foreach ($result['paginator']->getCollection() as $task): ?>
-                    <div class="table-list-row color-<?= $task['color_id'] ?>">
-                        <?= $this->render('task_list/task_title', array(
-                            'task' => $task,
-                            'redirect' => 'dashboard',
-                        )) ?>
-
-                        <?= $this->render('task_list/task_details', array(
-                            'task' => $task,
-                        )) ?>
-
-                        <?= $this->render('task_list/task_avatars', array(
-                            'task' => $task,
-                        )) ?>
-
-                        <?= $this->render('task_list/task_icons', array(
-                            'task' => $task,
-                        )) ?>
-
-                        <?= $this->render('task_list/task_subtasks', array(
-                            'task'    => $task,
-                            'user_id' => $user['id'],
-                        )) ?>
-
-                        <?= $this->hook->render('template:dashboard:task:footer', array('task' => $task)) ?>
-                    </div>
-                <?php endforeach ?>
-            </div>
-
-            <?= $result['paginator'] ?>
-        <?php endif ?>
-    <?php endforeach ?>
-<?php endif ?>
-
-<?= $this->hook->render('template:dashboard:show', array('user' => $user)) ?>
diff --git a/Template/dashboard/projects.php b/Template/dashboard/projects.php
new file mode 100644
index 0000000..972084e
--- /dev/null
+++ b/Template/dashboard/projects.php
@@ -0,0 +1,7 @@
+<span class="star-project" data-url="<?= $this->url->href('StarredProjectsController', 'starProject', array('plugin' => 'StarredProjects', 'project_id' => $project['id'])) ?>">
+	<?php if($this->app->starredProjectsModel->find($project['id'], $this->user->getId())): ?>
+		★
+	<?php else: ?>
+		☆
+	<?php endif; ?>
+</span>
diff --git a/Template/dashboard/starred-projects.php b/Template/dashboard/starred-projects.php
new file mode 100644
index 0000000..666ca9a
--- /dev/null
+++ b/Template/dashboard/starred-projects.php
@@ -0,0 +1,36 @@
+<?php $starredProjects = $this->app->starredProjectsModel->findAllProjects($this->user->getId()); ?>
+<?php if(!empty($starredProjects)): ?>
+    <div class="table-list">
+        <div class="table-list-header">
+            <div class="table-list-header-count"><?= t('Starred projects') ?></div>
+            <div class="table-list-header-menu">&nbsp;</div>
+        </div>
+        <?php foreach ($starredProjects as $project): ?>
+            <div class="table-list-row table-border-left">
+                <div>
+                    <?php if ($this->user->hasProjectAccess('ProjectViewController', 'show', $project['id'])): ?>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
+                    <?php else: ?>
+                        <strong><?= '#'.$project['id'] ?></strong>
+                    <?php endif ?>
+
+                    <span class="star-project" data-url="<?= $this->url->href('StarredProjectsController', 'starProject', array('plugin' => 'StarredProjects', 'project_id' => $project['id'])) ?>">
+                        <?php if($this->app->starredProjectsModel->find($project['id'], $this->user->getId())): ?>
+                            ★
+                        <?php else: ?>
+                            ☆
+                        <?php endif; ?>
+                    </span>
+
+                    <span class="table-list-title <?= $project['is_active'] == 0 ? 'status-closed' : '' ?>">
+                        <?= $this->url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?>
+                    </span>
+
+                    <?php if ($project['is_private']): ?>
+                        <i class="fa fa-lock fa-fw" title="<?= t('Private project') ?>"></i>
+                    <?php endif ?>
+                </div>
+            </div>
+        <?php endforeach; ?>
+    </div>
+<?php endif; ?>
diff --git a/Template/header/board_selector.php b/Template/header/board_selector.php
index 955b13e..518f7df 100644
--- a/Template/header/board_selector.php
+++ b/Template/header/board_selector.php
@@ -10,16 +10,4 @@
         }
     }
 ?>
-
-<?= $this->app->component('select-dropdown-autocomplete', array(
-    'name' => 'boardId',
-    'placeholder' => t('Display another project'),
-    'items' => $board_selector,
-    'redirect' => array(
-        'regex' => 'PROJECT_ID',
-        'url' => $this->url->to('BoardViewController', 'show', array('project_id' => 'PROJECT_ID')),
-    ),
-    'onFocus' => array(
-        'board.selector.open',
-    )
-)) ?>
+<?= $this->render('kanboard:header/board_selector', array('board_selector' => $board_selector)) ?>