diff --git a/core/core.php b/core/core.php
index 35b3ccac..48d3cb3d 100644
--- a/core/core.php
+++ b/core/core.php
@@ -31,7 +31,7 @@ class common {
 	const TEMP_DIR = 'site/tmp/';
 
 	// Numéro de version 
-	const ZWII_VERSION = '10.0.22.dev';
+	const ZWII_VERSION = '10.0.23.dev';
 
 	public static $actions = [];
 	public static $coreModuleIds = [
@@ -2347,7 +2347,6 @@ class layout extends common {
 			}
 			$items .= '</ul>';
 		}
-
 			
 		// Lien de connexion
 		if(
@@ -2364,20 +2363,23 @@ class layout extends common {
 			'">Connexion</a></li>';
 		}
 
-		// Menu de langues 
-		if (sizeof($this->i18nInstalled()) > 1) {
-			foreach ($this->i18nInstalled() as $itemKey => $item) {
-				$items .= '<li><form method="POST" action="' . helper::baseUrl() . 'i18n/lang" id="barFormSelectLanguage">';
-				$items .= '<input type="image" alt="'.$itemKey.'" class="flag';
-				$items .= $this->geti18n() === $itemKey ? ' flagSelected"' : '"';
-				$items .= ' name="'.$itemKey.'" src="' . helper::baseUrl(false) .'core/vendor/icon-flags/svg/'.  $itemKey .'.svg" data-tippy-content="'. $item .'" />';
-				$items .= '</form></li>';
-			}
-		}
-
 		// Retourne les items du menu
-		echo '<ul class="navLevel1">' . $items . '</ul>';
+		echo '<ul class="navLevel1">' . $items .  '</ul>';
+	}
 
+	public function showi18nUserSelect() {
+		$items = '';
+			// Menu de langues 
+			if (sizeof($this->i18nInstalled()) > 1) {
+				foreach ($this->i18nInstalled() as $itemKey => $item) {
+					$items .= '<li><form method="POST" action="' . helper::baseUrl() . 'i18n/lang" id="barFormSelectLanguage">';
+					$items .= '<input type="image" alt="'.$itemKey.'" class="flag';
+					$items .= $this->geti18n() === $itemKey ? ' flagSelected"' : '"';
+					$items .= ' name="'.$itemKey.'" src="' . helper::baseUrl(false) .'core/vendor/icon-flags/svg/'.  $itemKey .'.svg" data-tippy-content="'. $item .'" />';
+					$items .= '</form></li>';
+				}
+			}
+		echo '<ul>' . $items . '</ul>';
 	}
 
 	/**
diff --git a/core/layout/common.css b/core/layout/common.css
index 8604c1d4..af03590b 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -457,6 +457,26 @@ nav li ul {
 	padding-left: 10px;	
 }
 
+nav #i18nUserSelect {
+	text-align: right;
+}
+
+nav .col1,
+nav .col2,
+nav .col3,
+nav .col4,
+nav .col5,
+nav .col6,
+nav .col7,
+nav .col8,
+nav .col9,
+nav .col10,
+nav .col11,
+nav .col12 {
+	padding-top: 0px;
+	padding-bottom: 0px ;
+}
+
 nav li ul li {
 	display: block;
 	text-align: left;
@@ -493,7 +513,7 @@ nav a:hover {
 		display: none;
 		text-align: left;
 	}
-	nav li {
+	nav li, .flag {
 		display: block;
 	}
 	nav li ul {
@@ -503,6 +523,7 @@ nav a:hover {
 		min-width: inherit;
 		width: auto;
 	}
+
 	/* Taille du menu hamburger */
 	nav .zwiico-menu {
 		font-size:1.5em;
@@ -544,12 +565,15 @@ ul .menuSideChild, li .menuSideChild {
 
 /* Icones de langues du menu */
 nav .flag {
-	height: 30px;
-	padding: 5px;
+	height: 20px;
 	vertical-align: middle;
+	padding: 3px;
+	margin-top:12px;
 }
+
+
 nav .flagSelected {
-	padding: 0px;
+	height: 25px;
 }
 
 
diff --git a/core/layout/main.php b/core/layout/main.php
index fc269725..5f05b106 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -41,8 +41,16 @@
 				<div id="menu" class="
 				<?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';}
 				?>">
+				
+					<div class="row">
+						<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
+							<?php $layout->showMenu(); ?>
+						</div>
+						<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
+							<?php $layout->showi18nUserSelect(); ?>
+						</div>
+					</div>
 
-					<?php $layout->showMenu(); ?>
 				</div> <!--fin menu -->
 			</nav>
 		<?php endif; ?>
@@ -71,7 +79,16 @@
 			<!-- Menu dans le fond du site après la bannière -->
 			<nav>
 				<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
-				<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
+				<div id="menu" class="container">
+				<div class="row">
+						<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
+							<?php $layout->showMenu(); ?>
+						</div>
+						<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
+							<?php $layout->showi18nUserSelect(); ?>
+						</div>
+					</div>
+				</div>
 			</nav>
 		<?php endif; ?>
 		<!-- Site -->
@@ -80,7 +97,16 @@
 				<!-- Menu dans le site avant la bannière -->
 				<nav>
 					<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
-					<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
+					<div id="menu" class="container">
+					<div class="row">
+						<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
+							<?php $layout->showMenu(); ?>
+						</div>
+						<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
+							<?php $layout->showi18nUserSelect(); ?>
+						</div>
+					</div>
+					</div>
 				</nav>
 			<?php endif; ?>
 			<?php if(
@@ -119,7 +145,16 @@
 			<!-- Menu dans le site après la bannière -->
 			<nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
 				<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
-				<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
+				<div id="menu" class="container">
+				<div class="row">
+						<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
+							<?php $layout->showMenu(); ?>
+						</div>
+						<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
+							<?php $layout->showi18nUserSelect(); ?>
+						</div>
+					</div>
+				</div>
 			</nav>
 			<?php endif; ?>
 			<!-- Corps de page -->