try to fix menu

core/includes/mega-menu.tpl

@@ -5,26 +5,15 @@
  **********************************************************
 *}
 
-<!-- ******************************** mega-menu.tpl ******************************** -->
-{if $loggedin}
-	<li class="home-item">
-		<a class="nav-link" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home"></i> <span>{$LANG.clientareanavhome}</span></a>					
-	</li>
-{else}
-	{if $themesettings.headersetting.disablehomeicon neq "1"}
-		<li class="home-item">
-			<a class="nav-link" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home"></i> <span>{$LANG.clientareanavhome}</span></a>					
-		</li>
-	{/if}
-{/if}
-
+<!-- ******************************** mega-menu.tpl ******************************** -->
 {foreach $navbar as $item}
 {assign var='extras' value=$item->getExtras()}			
 <li data-menuItemName="{$item->getName()}"{if $item->hasChildren()} class="dropdown {$extras['parentclass']}"{elseif $item->getClass()} class="{$item->getClass()}"{/if} {if $item->getName() eq 'Home'} style="display: none;"{/if}>
 	<a class="nav-link{if !isset($rightDrop) || !$rightDrop}{/if}{if $item->hasChildren()} dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#"{else}" href="{$item->getUri()}"{/if}{if $item->getAttribute('target')} target="{$item->getAttribute('target')}"{/if}>
 
 	{if $item->getName() == "Home"}<i class="fas fa-home"></i>{else}{if $item->hasIcon()}<i class="{$item->getIcon()}"></i>&nbsp;{/if}{/if}
-
	<!-- mega-menu.tpl -->
+
+	<!-- mega-menu.tpl -->
 	<span>{$item->getLabel()}</span>
 
 	{if $item->hasBadge()} <span class="badge">{$item->getBadge()}</span>{/if}
@@ -81,7 +70,7 @@
 			<ul class="menu-list">
 				{foreach $item->getChildren() as $childItem}
 				{assign var='extras' value=$childItem->getExtras()}
-					<!-- mega-menu.tpl -->					
+					<!-- mega-menu.tpl -->					
 					<li data-menuItemName="{$childItem->getName()}"{if $childItem->getClass() || $extras['parentclass']} class="{$childItem->getClass()} {$extras['parentclass']}"{/if}>
 						<a class="nav-link" href="{$childItem->getUri()}"{if $childItem->getAttribute('target')} target="{$childItem->getAttribute('target')}"{/if}>
 							{if $childItem->hasIcon()}<i class="{$childItem->getIcon()}"></i> {/if}

core/layouts/default/header.tpl

@@ -14,9 +14,22 @@
 			<div class="container">
 				<!-- Brand and toggle get grouped for better mobile display -->
 				<div class="navbar-header">
-						<button type="button" class="navbar-toggler logo-section" data-toggle="collapse" id="navbar-side-toggle">
+					<div class="logo-section">
+						<button type="button" class="navbar-toggler" data-toggle="collapse" id="navbar-side-toggle">
 							<span></span>
 						</button>
+						{if $loggedin}
+							<li class="home-item">
+								<a class="nav-link" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home"></i> <span>{$LANG.clientareanavhome}</span></a>					
+							</li>
+						{else}
+							{if $themesettings.headersetting.disablehomeicon neq "1"}
+								<li class="home-item">
+									<a class="nav-link" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home"></i> <span>{$LANG.clientareanavhome}</span></a>					
+								</li>
+							{/if}
+						{/if}
+					</div>
 					<div class="top">
 						<ul id="mobile-header" class="nav secondary-menu-mobile">
 							<!-- TD-NAvBar-Right -->