diff --git a/app/Helper/Url.php b/app/Helper/Url.php
index 9bb38e591..64b2c83f9 100644
--- a/app/Helper/Url.php
+++ b/app/Helper/Url.php
@@ -24,11 +24,12 @@ class Url extends \Core\Base
      * @param  boolean  $csrf        Add a CSRF token
      * @param  string   $class       CSS class attribute
      * @param  boolean  $new_tab     Open the link in a new tab
+     * @param  string   $anchor      Link Anchor
      * @return string
      */
-    public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false)
+    public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '')
     {
-        return '<a href="'.$this->href($controller, $action, $params, $csrf).'" class="'.$class.'" title="'.$title.'" '.($new_tab ? 'target="_blank"' : '').'>'.$label.'</a>';
+        return '<a href="'.$this->href($controller, $action, $params, $csrf, $anchor).'" class="'.$class.'" title="'.$title.'" '.($new_tab ? 'target="_blank"' : '').'>'.$label.'</a>';
     }
 
     /**
@@ -39,9 +40,10 @@ class Url extends \Core\Base
      * @param  string   $action      Action name
      * @param  array    $params      Url parameters
      * @param  boolean  $csrf        Add a CSRF token
+     * @param  string   $anchor      Link Anchor
      * @return string
      */
-    public function href($controller, $action, array $params = array(), $csrf = false)
+    public function href($controller, $action, array $params = array(), $csrf = false, $anchor = '')
     {
         $values = array(
             'controller' => $controller,
@@ -54,7 +56,7 @@ class Url extends \Core\Base
 
         $values += $params;
 
-        return '?'.http_build_query($values, '', '&amp;');
+        return '?'.http_build_query($values, '', '&amp;').(empty($anchor) ? '' : '#'.$anchor);
     }
 
     /**
diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php
index a7741f8d8..201ee2fc8 100644
--- a/app/Template/board/swimlane.php
+++ b/app/Template/board/swimlane.php
@@ -1,19 +1,13 @@
-<tr>
+<tr id="swimlane-<?= $swimlane['id'] ?>">
     <?php if (! $hide_swimlane): ?>
        <th>
-
            <?php if (! $not_editable && $swimlane['nb_tasks'] > 0): ?>
                 <a href="#" class="board-swimlane-toggle" data-swimlane-id="<?= $swimlane['id'] ?>">
                     <i class="fa fa-minus-circle hide-icon-swimlane-<?= $swimlane['id'] ?>"></i>
                     <i class="fa fa-plus-circle show-icon-swimlane-<?= $swimlane['id'] ?>" style="display: none"></i>
                 </a>
+                <span class="board-swimlane-toggle-title show-icon-swimlane-<?= $swimlane['id'] ?>"><?= $this->e($swimlane['name']) ?></span>
            <?php endif ?>
-
-           <?= $this->e($swimlane['name']) ?>
-
-           <span title="<?= t('Task count') ?>" class="task-count">
-                (<span><?= $swimlane['nb_tasks'] ?></span>)
-            </span>
         </th>
     <?php endif ?>
 
@@ -54,7 +48,13 @@
 <tr class="swimlane-row-<?= $swimlane['id'] ?>">
 
     <?php if (! $hide_swimlane): ?>
-        <th></th>
+        <th class="board-swimlane-title">
+            <?= $this->e($swimlane['name']) ?>
+
+            <span title="<?= t('Task count') ?>" class="task-count">
+                (<span><?= $swimlane['nb_tasks'] ?></span>)
+            </span>
+        </th>
     <?php endif ?>
 
     <?php foreach ($swimlane['columns'] as $column): ?>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 18ddea36a..7bfda7729 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -3,7 +3,7 @@
         <ul>
             <li>
                 <i class="fa fa-table fa-fw"></i>
-                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
+                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id']), false, '', '', false, 'swimlane-'.$task['swimlane_id']) ?>
             </li>
             <li>
                 <i class="fa fa-calendar fa-fw"></i>
diff --git a/assets/css/app.css b/assets/css/app.css
index 061bc5071..2ffa014d1 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -848,6 +848,15 @@ nav .active a {
 #board th a.board-swimlane-toggle {
     font-size: 0.95em;
 }
+
+.board-swimlane-toggle-title {
+    font-size: 0.85em;
+    display: none;
+}
+
+.board-swimlane-title {
+    vertical-align: top;
+}
 /* task inside the board */
 .task-board {
     position: relative;
diff --git a/assets/css/print.css b/assets/css/print.css
index b4185ef5c..097bf12a2 100644
--- a/assets/css/print.css
+++ b/assets/css/print.css
@@ -238,6 +238,15 @@ th a:hover {
 #board th a.board-swimlane-toggle {
     font-size: 0.95em;
 }
+
+.board-swimlane-toggle-title {
+    font-size: 0.85em;
+    display: none;
+}
+
+.board-swimlane-title {
+    vertical-align: top;
+}
 /* task inside the board */
 .task-board {
     position: relative;
diff --git a/assets/css/src/board.css b/assets/css/src/board.css
index 7aaf78e8c..307246fca 100644
--- a/assets/css/src/board.css
+++ b/assets/css/src/board.css
@@ -94,3 +94,12 @@
 #board th a.board-swimlane-toggle {
     font-size: 0.95em;
 }
+
+.board-swimlane-toggle-title {
+    font-size: 0.85em;
+    display: none;
+}
+
+.board-swimlane-title {
+    vertical-align: top;
+}