diff --git a/ChangeLog b/ChangeLog
index 1bdc5bc2d..efbe7e80f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,7 +26,7 @@ Improvements:
 * Add dropdown menu with inline popup for all task actions
 * Change sidebar style
 * Change task summary layout
-* Use inline popup for subtasks, categories
+* Use inline popup for subtasks, categories, swimlanes, actions and columns
 * Move homepage menus to the user dropdown
 * Have a new task assigned to the creator by default instead of "no assignee"
 * Show progress for task links in board tooltips
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 7064884eb..b49be100f 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -51,7 +51,7 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('projects', 'project', 'index');
             $container['route']->addRoute('project/:project_id', 'project', 'show');
             $container['route']->addRoute('p/:project_id', 'project', 'show');
-            $container['route']->addRoute('project/:project_id/customer-filter', 'customfilter', 'index');
+            $container['route']->addRoute('project/:project_id/customer-filters', 'customfilter', 'index');
             $container['route']->addRoute('project/:project_id/share', 'project', 'share');
             $container['route']->addRoute('project/:project_id/notifications', 'project', 'notifications');
             $container['route']->addRoute('project/:project_id/integrations', 'project', 'integrations');
@@ -77,27 +77,15 @@ class RouteProvider implements ServiceProviderInterface
 
             // Action routes
             $container['route']->addRoute('project/:project_id/actions', 'action', 'index');
-            $container['route']->addRoute('project/:project_id/action/:action_id/confirm', 'action', 'confirm');
 
             // Column routes
             $container['route']->addRoute('project/:project_id/columns', 'column', 'index');
-            $container['route']->addRoute('project/:project_id/column/:column_id/edit', 'column', 'edit');
-            $container['route']->addRoute('project/:project_id/column/:column_id/confirm', 'column', 'confirm');
-            $container['route']->addRoute('project/:project_id/column/:column_id/move/:direction', 'column', 'move');
 
             // Swimlane routes
             $container['route']->addRoute('project/:project_id/swimlanes', 'swimlane', 'index');
-            $container['route']->addRoute('project/:project_id/swimlane/:swimlane_id/edit', 'swimlane', 'edit');
-            $container['route']->addRoute('project/:project_id/swimlane/:swimlane_id/confirm', 'swimlane', 'confirm');
-            $container['route']->addRoute('project/:project_id/swimlane/:swimlane_id/disable', 'swimlane', 'disable');
-            $container['route']->addRoute('project/:project_id/swimlane/:swimlane_id/enable', 'swimlane', 'enable');
-            $container['route']->addRoute('project/:project_id/swimlane/:swimlane_id/up', 'swimlane', 'moveup');
-            $container['route']->addRoute('project/:project_id/swimlane/:swimlane_id/down', 'swimlane', 'movedown');
 
             // Category routes
             $container['route']->addRoute('project/:project_id/categories', 'category', 'index');
-            $container['route']->addRoute('project/:project_id/category/:category_id/edit', 'category', 'edit');
-            $container['route']->addRoute('project/:project_id/category/:category_id/confirm', 'category', 'confirm');
 
             // Task routes
             $container['route']->addRoute('project/:project_id/task/:task_id', 'task', 'show');
diff --git a/app/Template/action/index.php b/app/Template/action/index.php
index c28c7a4ba..66cfed774 100644
--- a/app/Template/action/index.php
+++ b/app/Template/action/index.php
@@ -53,7 +53,7 @@
             </ul>
         </td>
         <td>
-            <?= $this->url->link(t('Remove'), 'action', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id'])) ?>
+            <?= $this->url->link(t('Remove'), 'action', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?>
         </td>
     </tr>
     <?php endforeach ?>
diff --git a/app/Template/action/remove.php b/app/Template/action/remove.php
index c8d4dfe42..070a79181 100644
--- a/app/Template/action/remove.php
+++ b/app/Template/action/remove.php
@@ -10,6 +10,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'action', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id'])) ?>
+        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/Template/column/edit.php b/app/Template/column/edit.php
index a17affd8b..618cb1342 100644
--- a/app/Template/column/edit.php
+++ b/app/Template/column/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit column "%s"', $column['title']) ?></h2>
 </div>
 
-<form method="post" action="<?= $this->url->href('column', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('column', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -37,8 +37,8 @@
     <div class="form-help"><?= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id'])) ?>
+        <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/column/index.php b/app/Template/column/index.php
index 17651d469..85d46f26c 100644
--- a/app/Template/column/index.php
+++ b/app/Template/column/index.php
@@ -29,7 +29,7 @@
                 <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
                 <ul>
                     <li>
-                        <?= $this->url->link(t('Edit'), 'column', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
+                        <?= $this->url->link(t('Edit'), 'column', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
                     </li>
                     <?php if ($column['position'] != $first_position): ?>
                     <li>
@@ -42,7 +42,7 @@
                     </li>
                     <?php endif ?>
                     <li>
-                        <?= $this->url->link(t('Remove'), 'column', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
+                        <?= $this->url->link(t('Remove'), 'column', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
                     </li>
                 </ul>
                 </div>
@@ -87,6 +87,6 @@
     <div class="form-help"><?= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Add this column') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Add this column') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/column/remove.php b/app/Template/column/remove.php
index 28d0928fe..ccab889d8 100644
--- a/app/Template/column/remove.php
+++ b/app/Template/column/remove.php
@@ -10,6 +10,6 @@
 
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'column', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id'])) ?>
+        <?= t('or') ?> <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/Template/swimlane/edit.php b/app/Template/swimlane/edit.php
index dfc5cf0b5..31d819d43 100644
--- a/app/Template/swimlane/edit.php
+++ b/app/Template/swimlane/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Swimlane modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form method="post" action="<?= $this->url->href('swimlane', 'update', array('project_id' => $project['id'], 'swimlane_id' => $values['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'update', array('project_id' => $project['id'], 'swimlane_id' => $values['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -34,8 +34,8 @@
     <div class="form-help"><?= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
+        <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php
index 65751606e..90100a989 100644
--- a/app/Template/swimlane/index.php
+++ b/app/Template/swimlane/index.php
@@ -66,6 +66,6 @@
     <div class="form-help"><?= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
     </div>
 </form>
diff --git a/app/Template/swimlane/remove.php b/app/Template/swimlane/remove.php
index 1d7c2b7ab..9be39ff8b 100644
--- a/app/Template/swimlane/remove.php
+++ b/app/Template/swimlane/remove.php
@@ -11,7 +11,7 @@
         <div class="form-actions">
             <?= $this->url->link(t('Yes'), 'swimlane', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
 </section>
\ No newline at end of file
diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php
index 89915d569..60eea47bc 100644
--- a/app/Template/swimlane/table.php
+++ b/app/Template/swimlane/table.php
@@ -27,7 +27,7 @@
                     </li>
                 <?php endif ?>
                 <li>
-                    <?= $this->url->link(t('Edit'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id'])) ?>
+                    <?= $this->url->link(t('Edit'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                 </li>
                 <li>
                     <?php if ($swimlane['is_active']): ?>
@@ -37,7 +37,7 @@
                     <?php endif ?>
                 </li>
                 <li>
-                    <?= $this->url->link(t('Remove'), 'swimlane', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id'])) ?>
+                    <?= $this->url->link(t('Remove'), 'swimlane', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                 </li>
             </ul>
             </div>