diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 10c6d1a..859438e 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -108,6 +108,7 @@ final class BackendController extends Controller
         $board = KanbanBoardMapper::get()
             ->with('columns')
             ->with('columns/cards')
+            ->with('columns/cards/comments')
             ->with('columns/cards/tags')
             ->with('columns/cards/tags/title')
             ->where('id', (int) $request->getData('id'))
diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css
index 1053388..6bb3d28 100755
--- a/Theme/Backend/css/styles.css
+++ b/Theme/Backend/css/styles.css
@@ -5,3 +5,10 @@
     flex: 1; }
   .kanban-column .portlet-head div {
     flex: 0; }
+    .kanban-board {
+      column-gap: 1rem;
+      flex-wrap: nowrap;
+  }
+  .kanban-column {
+    min-width: 300px;
+  }
\ No newline at end of file
diff --git a/Theme/Backend/css/styles.scss b/Theme/Backend/css/styles.scss
index 1ecf2ce..47d3d52 100755
--- a/Theme/Backend/css/styles.scss
+++ b/Theme/Backend/css/styles.scss
@@ -11,4 +11,11 @@
             flex: 0;
         }
     }
+
+    min-width: 300px;
+}
+
+.kanban-board {
+    column-gap: 1rem;
+    flex-wrap: nowrap;
 }
\ No newline at end of file
diff --git a/Theme/Backend/kanban-archive.tpl.php b/Theme/Backend/kanban-archive.tpl.php
index f748f43..1b892b8 100755
--- a/Theme/Backend/kanban-archive.tpl.php
+++ b/Theme/Backend/kanban-archive.tpl.php
@@ -26,7 +26,7 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Archive'); ?><i class="fa fa-download floatRight download btn"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Archive'); ?><i class="lni lni-download download btn end-xs"></i></div>
             <div class="slider">
             <table id="kanbanArchiveList" class="default sticky">
                 <thead>
diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php
index 5f17e5c..6c8f8d9 100755
--- a/Theme/Backend/kanban-board.tpl.php
+++ b/Theme/Backend/kanban-board.tpl.php
@@ -17,10 +17,13 @@ $board = $this->getData('board');
 
 /** @var \Modules\Kanban\Models\KanbanColumn[] $columns */
 $columns = $board->getColumns();
+
+$columnCount = \count($columns);
+$layout = \max(4, $columnCount);
 ?>
-<div class="row">
+<div class="row kanban-board">
     <?php $i = 0; foreach ($columns as $column) : $i++; $cards = $column->getCards(); ?>
-    <div id="kanban-column-<?= $i; ?>" class="col-xs-12 col-md-6 col-lg-3 box kanban-column">
+    <div id="kanban-column-<?= $i; ?>" class="box kanban-column">
         <header><?= $this->printHtml($column->name); ?></header>
         <?php $j = 0; foreach ($cards as $card) : $j++;
             $url = \phpOMS\Uri\UriFactory::build('kanban/card?{?}&id=' . $card->id);
@@ -32,12 +35,13 @@ $columns = $board->getColumns();
                 </div>
                 <div class="portlet-body">
                     <article><?= $card->description; ?></article>
+
+                    <?php $tags = $card->getTags(); foreach ($tags as $tag) : ?>
+                        <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !empty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                    <?php endforeach; ?>
                 </div>
                 <div class="portlet-foot">
                     <div class="overflowfix">
-                        <?php $tags = $card->getTags(); foreach ($tags as $tag) : ?>
-                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !empty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
-                        <?php endforeach; ?>
                         <a href="<?= $url; ?>" class="button floatRight"><?= $this->getHtml('More', '0', '0'); ?></a>
                     </div>
                 </div>
diff --git a/Theme/Backend/kanban-dashboard.tpl.php b/Theme/Backend/kanban-dashboard.tpl.php
index 7bed13c..20589e2 100755
--- a/Theme/Backend/kanban-dashboard.tpl.php
+++ b/Theme/Backend/kanban-dashboard.tpl.php
@@ -22,6 +22,17 @@ $next     = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \
 
 echo $this->getData('nav')->render(); ?>
 
+<div class="row">
+    <?php if (empty($boards)) : ?>
+        <div class="emptyPage"></div>
+        <?php else : ?>
+        <div class="plain-portlet">
+            <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
+        </div>
+    <?php endif; ?>
+</div>
+
 <div class="row">
     <?php foreach ($boards as $board) :
         $url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->id);
@@ -33,25 +44,16 @@ echo $this->getData('nav')->render(); ?>
             </div>
             <div class="portlet-body">
                 <article><?= $board->description; ?></article>
+                <?php $tags = $board->getTags(); foreach ($tags as $tag) : ?>
+                    <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !empty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                <?php endforeach; ?>
             </div>
             <div class="portlet-foot">
                  <div class="overflowfix">
-                    <?php $tags = $board->getTags(); foreach ($tags as $tag) : ?>
-                        <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !empty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
-                    <?php endforeach; ?>
                     <a tabindex="0" href="<?= $url; ?>" class="button floatRight"><?= $this->getHtml('Open', '0', '0'); ?></a>
                 </div>
             </div>
         </section>
     </div>
     <?php endforeach; ?>
-
-    <?php if (empty($boards)) : ?>
-    <div class="emptyPage"></div>
-    <?php else : ?>
-    <div class="plain-portlet">
-        <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
-        <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
-    </div>
-    <?php endif; ?>
 <div>