diff --git a/css/backoffice/layout/multi-column/_column.scss b/css/backoffice/layout/multi-column/_column.scss
index 1e5981608..8da85c558 100644
--- a/css/backoffice/layout/multi-column/_column.scss
+++ b/css/backoffice/layout/multi-column/_column.scss
@@ -3,11 +3,20 @@
  * license     http://opensource.org/licenses/AGPL-3.0
  */
 
+$ibo-column--min-width: 300px !default;
+$ibo-column--padding-x: abs($ibo-multi-column--margin-x) !default;
+$ibo-column--padding-y: 0 !default;
+
+$ibo-column--margin-bottom--is-last-element: 20px !default;
+
 .ibo-column {
-  min-width: 300px;
+  min-width: $ibo-column--min-width;
   flex-grow: 1;
   flex-shrink: 1;
-  padding: 0 20px;
+  padding: $ibo-column--padding-y $ibo-column--padding-x;
   flex-basis: 10%;
-  margin-bottom: 20px;
+
+  :not(:last-child){
+    margin-bottom: $ibo-column--margin-bottom--is-last-element;
+  }
 }
diff --git a/css/backoffice/layout/multi-column/_multi-column.scss b/css/backoffice/layout/multi-column/_multi-column.scss
index 12763f45f..d71d71ab5 100644
--- a/css/backoffice/layout/multi-column/_multi-column.scss
+++ b/css/backoffice/layout/multi-column/_multi-column.scss
@@ -3,8 +3,11 @@
  * license     http://opensource.org/licenses/AGPL-3.0
  */
 
+$ibo-multi-column--margin-x: -16px !default; /* This is to compensate columns padding and make the whole multicolumn align with the parent borders (cf. Bootstrap rows / cols) */
+$ibo-multi-column--margin-y: 0 !default;
+
 .ibo-multi-column {
-  width: 100%;
   display: flex;
   flex-wrap: wrap;
+  margin: $ibo-multi-column--margin-y $ibo-multi-column--margin-x;
 }
\ No newline at end of file
diff --git a/sources/application/UI/Layout/MultiColumn/Column/Column.php b/sources/application/UI/Layout/MultiColumn/Column/Column.php
index 1fe052d08..d10fa3d0c 100644
--- a/sources/application/UI/Layout/MultiColumn/Column/Column.php
+++ b/sources/application/UI/Layout/MultiColumn/Column/Column.php
@@ -19,5 +19,5 @@ use Combodo\iTop\Application\UI\Layout\UIContentBlock;
 class Column extends UIContentBlock {
 	// Overloaded constants
 	public const BLOCK_CODE = 'ibo-column';
-	public const HTML_TEMPLATE_REL_PATH = 'layouts/multicolumn/column/layout';
+	public const HTML_TEMPLATE_REL_PATH = 'layouts/multi-column/column/layout';
 }
\ No newline at end of file
diff --git a/sources/application/UI/Layout/MultiColumn/MultiColumn.php b/sources/application/UI/Layout/MultiColumn/MultiColumn.php
index 5ca63a757..ec73a4346 100644
--- a/sources/application/UI/Layout/MultiColumn/MultiColumn.php
+++ b/sources/application/UI/Layout/MultiColumn/MultiColumn.php
@@ -19,8 +19,8 @@ use Combodo\iTop\Application\UI\UIBlock;
  */
 class MultiColumn extends UIBlock {
 	// Overloaded constants
-	public const BLOCK_CODE = 'ibo-multicolumn';
-	public const HTML_TEMPLATE_REL_PATH = 'layouts/multicolumn/layout';
+	public const BLOCK_CODE = 'ibo-multi-column';
+	public const HTML_TEMPLATE_REL_PATH = 'layouts/multi-column/layout';
 
 	/** @var \Combodo\iTop\Application\UI\Layout\MultiColumn\Column\Column[] */
 	protected $aColumns;
diff --git a/templates/layouts/multicolumn/column/layout.html.twig b/templates/layouts/multi-column/column/layout.html.twig
similarity index 100%
rename from templates/layouts/multicolumn/column/layout.html.twig
rename to templates/layouts/multi-column/column/layout.html.twig
diff --git a/templates/layouts/multicolumn/layout.html.twig b/templates/layouts/multi-column/layout.html.twig
similarity index 100%
rename from templates/layouts/multicolumn/layout.html.twig
rename to templates/layouts/multi-column/layout.html.twig