diff --git a/desktop/js/atlas.js b/desktop/js/atlas.js
index 92b4855..a5dc147 100644
--- a/desktop/js/atlas.js
+++ b/desktop/js/atlas.js
@@ -112,19 +112,41 @@ function addCmdToTable(_cmd) {
   if (!isset(_cmd)) {
     var _cmd = { configuration: {} }
   }
+  if (!isset(_cmd.configuration)) {
+    _cmd.configuration = {}
+  }
   var tr = '<tr class="cmd" data-cmd_id="' + init(_cmd.id) + '">'
+  tr += '<td class="hidden-xs">'
+  tr += '<span class="cmdAttr" data-l1key="id"></span>'
+  tr += '</td>'
   tr += '<td>'
-  tr += '<input class="cmdAttr form-control input-sm" data-l1key="id" style="display : none;">'
-  tr += '<input class="cmdAttr form-control input-sm" data-l1key="name"></td>'
+  tr += '<div class="input-group">'
+  tr += '<input class="cmdAttr form-control input-sm roundedLeft" data-l1key="name" placeholder="{{Nom de la commande}}">'
+  tr += '<span class="input-group-btn"><a class="cmdAction btn btn-sm btn-default" data-l1key="chooseIcon" title="{{Choisir une icône}}"><i class="fas fa-icons"></i></a></span>'
+  tr += '<span class="cmdAttr input-group-addon roundedRight" data-l1key="display" data-l2key="icon" style="font-size:19px;padding:0 5px 0 0!important;"></span>'
+  tr += '</div>'
+  tr += '</td>'
+  tr += '<td>'
+  tr += '<span class="type disable" type="' + init(_cmd.type) + '">' + jeedom.cmd.availableType() + '</span>'
+  tr += '<span class="subType disable" subType="' + init(_cmd.subType) + '"></span>'
+  tr += '</td>'
   tr += '<td>'
-  tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="isHistorized" checked/>{{Historiser}}</label></span> '
+  tr += '<label class="checkbox-inline"><input type="checkbox" class="cmdAttr" data-l1key="isVisible" checked/>{{Afficher}}</label> '
+  tr += '<label class="checkbox-inline"><input type="checkbox" class="cmdAttr" data-l1key="isHistorized" checked/>{{Historiser}}</label> '
+  tr += '<label class="checkbox-inline"><input type="checkbox" class="cmdAttr" data-l1key="display" data-l2key="invertBinary"/>{{Inverser}}</label> '
+  tr += '<div style="margin-top:7px;">'
+  tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="minValue" placeholder="{{Min}}" title="{{Min}}" style="width:30%;max-width:80px;display:inline-block;margin-right:2px;">'
+  tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="maxValue" placeholder="{{Max}}" title="{{Max}}" style="width:30%;max-width:80px;display:inline-block;margin-right:2px;">'
+  tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="unite" placeholder="Unité" title="{{Unité}}" style="width:30%;max-width:80px;display:inline-block;margin-right:2px;">'
+  tr += '</div>'
   tr += '</td>'
+  tr += '<td>';
+  tr += '<span class="cmdAttr" data-l1key="htmlstate"></span>';
+  tr += '</td>';
   tr += '<td>'
-  tr += '<input class="cmdAttr form-control input-sm" data-l1key="type" style="display : none;">'
-  tr += '<input class="cmdAttr form-control input-sm" data-l1key="subType" style="display : none;">'
   if (is_numeric(_cmd.id)) {
-    tr += '<a class="btn btn-default btn-xs cmdAction expertModeVisible" data-action="configure"><i class="fa fa-cogs"></i></a> '
-    tr += '<a class="btn btn-default btn-xs cmdAction" data-action="test"><i class="fa fa-rss"></i> {{Tester}}</a>'
+    tr += '<a class="btn btn-default btn-xs cmdAction" data-action="configure"><i class="fas fa-cogs"></i></a> '
+    tr += '<a class="btn btn-default btn-xs cmdAction" data-action="test"><i class="fas fa-rss"></i> {{Tester}}</a>'
   }
   tr += '<i class="fa fa-minus-circle pull-right cmdAction cursor" data-action="remove"></i></td>'
   tr += '</tr>'
diff --git a/desktop/php/atlas.php b/desktop/php/atlas.php
index ccd370f..b557bed 100644
--- a/desktop/php/atlas.php
+++ b/desktop/php/atlas.php
@@ -19,16 +19,16 @@
 				<br>
 				<span>{{Configuration}}</span>
 			</div>
-						<?php
+			<?php
 			$hostname = trim(shell_exec('cat /etc/hostname'));
-			
-			if($hostname == 'JeedomAtlas' || $hostname == 'jeedomAtlas'){ ?>
-			<div class="cursor logoSecondary" id="bt_USBrecovery">
-				<i class="fab fa-usb"></i>
-				<br>
-				<span>{{Création clé Recovery (BETA)}}</span>
-			</div>
-			<?php }else if(strpos($hostname,'JeedomAtlasRecovery') !== false){ ?>
+
+			if ($hostname == 'JeedomAtlas' || $hostname == 'jeedomAtlas') { ?>
+				<div class="cursor logoSecondary" id="bt_USBrecovery">
+					<i class="fab fa-usb"></i>
+					<br>
+					<span>{{Création clé Recovery (BETA)}}</span>
+				</div>
+			<?php } else if (strpos($hostname, 'JeedomAtlasRecovery') !== false) { ?>
 				<div class="cursor logoSecondary" id="bt_recovery">
 					<i class="fas fa-clone"></i>
 					<br>
@@ -39,11 +39,11 @@
 		<legend><i class="fas fa-table"></i> {{Mes Modules Atlas}}</legend>
 		<?php
 		if (count($eqLogics) == 0) {
-			echo '<br/><div class="text-center" style="font-size:1.2em;font-weight:bold;">{{Aucun équipement Atlas n\'a été trouvé.}}</div>';
+			echo '<br><div class="text-center" style="font-size:1.2em;font-weight:bold;">{{Aucun équipement Atlas n\'a été trouvé}}</div>';
 		} else {
 			// Champ de recherche
 			echo '<div class="input-group" style="margin:5px;">';
-			echo '<input class="form-control roundedLeft" placeholder="{{Rechercher}}" id="in_searchEqlogic"/>';
+			echo '<input class="form-control roundedLeft" placeholder="{{Rechercher}}" id="in_searchEqlogic">';
 			echo '<div class="input-group-btn">';
 			echo '<a id="bt_resetSearch" class="btn" style="width:30px"><i class="fas fa-times"></i></a>';
 			echo '<a class="btn roundedRight hidden" id="bt_pluginDisplayAsTable" data-coreSupport="1" data-state="0"><i class="fas fa-grip-lines"></i></a>';
@@ -54,9 +54,12 @@
 			foreach ($eqLogics as $eqLogic) {
 				$opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard';
 				echo '<div class="eqLogicDisplayCard cursor ' . $opacity . '" data-eqLogic_id="' . $eqLogic->getId() . '">';
-				echo '<img src="' . $plugin->getPathImgIcon() . '"/>';
+				echo '<img src="' . $eqLogic->getImage() . '"/>';
 				echo '<br>';
 				echo '<span class="name">' . $eqLogic->getHumanName(true, true) . '</span>';
+				echo '<span class="hiddenAsCard displayTableRight hidden">';
+				echo ($eqLogic->getIsVisible() == 1) ? '<i class="fas fa-eye" title="{{Equipement visible}}"></i>' : '<i class="fas fa-eye-slash" title="{{Equipement non visible}}"></i>';
+				echo '</span>';
 				echo '</div>';
 			}
 			echo '</div>';
@@ -83,142 +86,161 @@
 			<li role="presentation" class="active"><a href="#eqlogictab" aria-controls="home" role="tab" data-toggle="tab"><i class="fas fa-tachometer-alt"></i> {{Equipement}}</a></li>
 			<li role="presentation"><a href="#commandtab" aria-controls="home" role="tab" data-toggle="tab"><i class="fas fa-list"></i> {{Commandes}}</a></li>
 		</ul>
-		<div class="tab-content" style="height:calc(100% - 50px);overflow:auto;overflow-x: hidden;">
-			<div role="tabpanel" class="tab-pane active" id="eqlogictab"><br />
-				<div class="row">
-					<div class="col-sm-7">
-						<form class="form-horizontal">
-							<fieldset>
-								<legend><i class="fa fa-arrow-circle-left eqLogicAction cursor" data-action="returnToThumbnailDisplay"></i> {{Général}}<i class='fa fa-cogs eqLogicAction pull-right cursor expertModeVisible' data-action='configure'></i></legend>
-								<div class="form-group">
-									<label class="col-lg-3 control-label">{{Nom de l'équipement}}</label>
-									<div class="col-lg-4">
-										<input type="text" class="eqLogicAttr form-control" data-l1key="id" style="display : none;" />
-										<input type="text" class="eqLogicAttr form-control" data-l1key="name" placeholder="{{Nom de l'équipement}}" />
-									</div>
-
+		<div class="tab-content">
+			<!-- Onglet de configuration de l'équipement -->
+			<div role="tabpanel" class="tab-pane active" id="eqlogictab">
+				<!-- Partie gauche de l'onglet "Equipements" -->
+				<!-- Paramètres généraux et spécifiques de l'équipement -->
+				<form class="form-horizontal">
+					<fieldset>
+						<div class="col-lg-6">
+							<legend><i class="fas fa-wrench"></i> {{Paramètres généraux}}</legend>
+							<div class="form-group">
+								<label class="col-sm-4 control-label">{{Nom de l'équipement}}</label>
+								<div class="col-sm-6">
+									<input type="text" class="eqLogicAttr form-control" data-l1key="id" style="display:none;">
+									<input type="text" class="eqLogicAttr form-control" data-l1key="name" placeholder="{{Nom de l'équipement}}">
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-sm-4 control-label">{{Objet parent}}</label>
+								<div class="col-sm-6">
+									<select id="sel_object" class="eqLogicAttr form-control" data-l1key="object_id">
+										<option value="">{{Aucun}}</option>
+										<?php
+										$options = '';
+										foreach ((jeeObject::buildTree(null, false)) as $object) {
+											$options .= '<option value="' . $object->getId() . '">' . str_repeat('&nbsp;&nbsp;', $object->getConfiguration('parentNumber')) . $object->getName() . '</option>';
+										}
+										echo $options;
+										?>
+									</select>
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-sm-4 control-label">{{Catégorie}}</label>
+								<div class="col-sm-6">
+									<?php
+									foreach (jeedom::getConfiguration('eqLogic:category') as $key => $value) {
+										echo '<label class="checkbox-inline">';
+										echo '<input type="checkbox" class="eqLogicAttr" data-l1key="category" data-l2key="' . $key . '" >' . $value['name'];
+										echo '</label>';
+									}
+									?>
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-sm-4 control-label">{{Options}}</label>
+								<div class="col-sm-6">
+									<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isEnable" checked>{{Activer}}</label>
+									<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isVisible" checked>{{Visible}}</label>
+								</div>
+							</div>
+							<legend><i class="fas fa-cogs"></i> {{Paramètres spécifiques}}</legend>
+							<div class="form-group">
+								<label class="col-sm-4 control-label">{{Wifi}}</label>
+								<div class="col-sm-6">
+									<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr ipfixwifienabled" data-l1key="configuration" data-l2key="wifiEnabled" id="wifiEnabledCheck" unchecked />{{Activer}}</label>
+								</div>
+							</div>
+							<div class="form-group wifi" style="display:none">
+								<label class="col-sm-4 control-label">{{Réseau wifi}}</label>
+								<div class="col-sm-6">
+									<select class="eqLogicAttr form-control nohotspot" data-l1key="configuration" data-l2key="wifiSsid"></select>
 								</div>
-								<div class="form-group">
-									<label class="col-lg-3 control-label">{{Objet parent}}</label>
-									<div class="col-lg-4">
-										<select id="sel_object" class="eqLogicAttr form-control" data-l1key="object_id">
-											<option value="">{{Aucun}}</option>
-											<?php
-											foreach (jeeObject::all() as $object) {
-												echo '<option value="' . $object->getId() . '">' . $object->getName() . '</option>';
-											}
-											?>
-										</select>
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-3 control-label"></label>
-									<div class="col-sm-9">
-										<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isEnable" checked />{{Activer}}</label>
-										<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isVisible" checked />{{Visible}}</label>
-									</div>
-								</div>
-								<legend><i class="fa fa-wifi"></i> {{Wifi}}</legend>
-								<div class="form-group">
-									<div class="col-lg-2">
-									</div>
-									<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr ipfixwifienabled" data-l1key="configuration" data-l2key="wifiEnabled" id="wifiEnabledCheck" unchecked />{{Activer le wifi}}</label>
-								</div>
-								<br />
 								<div class="col-lg-2">
+									<a class="btn btn-info" id="bt_refreshWifiList"><i class="fas fa-sync-alt"></i></a>
 								</div>
-								<div class="form-group wifihot" style="display:none">
-									<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr ipfixwifienabled" data-l1key="configuration" data-l2key="hotspotEnabled" id="hotspotEnabledCheck" unchecked />{{Activer le hotspot}}</label>
-								</div>
-								<div class="form-group wifihotspot" style="display:none">
-									<br />
-									<label class="col-lg-2 control-label">{{Ssid du hotspot}}</label>
-									<div class="col-lg-6">
-										<input type="text" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="ssidHotspot" />
-									</div>
-								</div>
-								<div class="form-group wifihotspot" style="display:none">
-									<label class="col-lg-2 control-label">{{Clef du hotspot}}</label>
-									<div class="col-lg-5">
-										<input type="password" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="mdpHotspot" />
-									</div>
-								</div>
-								<div class="form-group" style="display:none">
-									<br />
-									<label class="col-lg-2 control-label">{{DHCP Hotspot}} :</label>
-									<div class="col-lg-5">
-										<select class="eqLogicAttr form-control" id='dnsSelect' data-l1key="configuration" data-l2key="dns">
-											<option id="dnsDesactivated" value="desactivated">{{Désactivé}}</option>
-											<option id="dnsWlan0" value="wlan0">{{Wifi Hotspot}}</option>
-											<option id="dnsEth0" value="eth0">{{Ethernet Hotspot}}</option>
-										</select>
-									</div>
-								</div>
-								<div class="form-group wifi" style="display:none">
-									<br />
-									<label class="col-lg-2 control-label">{{Réseau wifi}}</label>
-									<div class="col-lg-8">
-										<select class="eqLogicAttr form-control nohotspot" data-l1key="configuration" data-l2key="wifiSsid"></select>
-									</div>
-									<div class="col-lg-2">
-										<a class="btn btn-info" id="bt_refreshWifiList"><i class="fas fa-sync-alt"></i></a>
-									</div>
-								</div>
-								<div class="form-group wifi" style="display:none">
-									<label class="col-lg-2 control-label">{{Clef}}</label>
-									<div class="col-lg-8">
-										<input type="password" class="eqLogicAttr form-control nohotspot" data-l1key="configuration" data-l2key="wifiPassword" />
-									</div>
-								</div>
-							</fieldset>
-						</form>
-					</div>
-					<div class="col-sm-5">
-						<form class="form-horizontal">
-							<fieldset>
-								<legend><i class="fa fa-info-circle"></i> {{Informations}}</legend>
-								<div class="form-group">
-									<label class="col-lg-4 control-label">{{Adresse MAC ethernet}}</label>
-									<div class="col-lg-4">
-										<span class="label label-info macLan" style="font-size:1em;cursor:default;"></span>
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-lg-4 control-label">{{Adresse Ip ethernet}}</label>
-									<div class="col-lg-4">
-										<span class="label label-info ipLan" style="font-size:1em;cursor:default;"></span>
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-lg-4 control-label">{{Adresse MAC wifi}}</label>
-									<div class="col-lg-4">
-										<span class="label label-info macWifi" style="font-size:1em;cursor:default;"></span>
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-lg-4 control-label">{{Adresse Ip wifi}}</label>
-									<div class="col-lg-4">
-										<span class="label label-info ipWifi" style="font-size:1em;cursor:default;"></span>
-									</div>
-								</div>
-							</fieldset>
-						</form>
-					</div>
-				</div>
-			</div>
+							</div>
+							<div class="form-group wifi" style="display:none">
+								<label class="col-sm-4 control-label">{{Clef}}</label>
+								<div class="col-sm-6">
+									<input type="password" class="eqLogicAttr form-control nohotspot" data-l1key="configuration" data-l2key="wifiPassword" />
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-sm-4 control-label">{{Hotspot}}</label>
+								<div class="col-sm-6">
+									<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr ipfixwifienabled" data-l1key="configuration" data-l2key="hotspotEnabled" id="hotspotEnabledCheck" unchecked />{{Activer}}</label>
+								</div>
+							</div>
+							<div class="form-group wifihotspot" style="display:none">
+								<label class="col-sm-4 control-label">{{SSID du hotspot}}</label>
+								<div class="col-sm-6">
+									<input type="text" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="ssidHotspot" />
+								</div>
+							</div>
+							<div class="form-group wifihotspot" style="display:none">
+								<label class="col-sm-4 control-label">{{Clef du hotspot}}</label>
+								<div class="col-sm-6">
+									<input type="password" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="mdpHotspot" />
+								</div>
+							</div>
+							<div class="form-group" style="display:none">
+								<label class="col-sm-4 control-label">{{DHCP Hotspot}} :</label>
+								<div class="col-sm-6">
+									<select class="eqLogicAttr form-control" id='dnsSelect' data-l1key="configuration" data-l2key="dns">
+										<option id="dnsDesactivated" value="desactivated">{{Désactivé}}</option>
+										<option id="dnsWlan0" value="wlan0">{{Wifi Hotspot}}</option>
+										<option id="dnsEth0" value="eth0">{{Ethernet Hotspot}}</option>
+									</select>
+								</div>
+							</div>
+						</div>
+						<!-- Partie droite de l'onglet "Équipement" -->
+						<!-- Affiche un champ de commentaire par défaut mais vous pouvez y mettre ce que vous voulez -->
+						<div class="col-lg-6">
+							<legend><i class="fas fa-info"></i> {{Informations}}</legend>
+							<div class="form-group">
+								<label class="col-lg-4 control-label">{{Adresse MAC ethernet}}</label>
+								<div class="col-lg-6">
+									<span class="label label-info macLan" style="font-size:1em;cursor:default;"></span>
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-lg-4 control-label">{{Adresse IP ethernet}}</label>
+								<div class="col-lg-6">
+									<span class="label label-info ipLan" style="font-size:1em;cursor:default;"></span>
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-lg-4 control-label">{{Adresse MAC Wifi}}</label>
+								<div class="col-lg-6">
+									<span class="label label-info macWifi" style="font-size:1em;cursor:default;"></span>
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-lg-4 control-label">{{Adresse IP Wifi}}</label>
+								<div class="col-lg-6">
+									<span class="label label-info ipWifi" style="font-size:1em;cursor:default;"></span>
+								</div>
+							</div>
+						</div>
+					</fieldset>
+				</form>
+			</div><!-- /.tabpanel #eqlogictab-->
+
+			<!-- Onglet des commandes de l'équipement -->
 			<div role="tabpanel" class="tab-pane" id="commandtab">
-				<table id="table_cmd" class="table table-bordered table-condensed">
-					<thead>
-						<tr>
-							<th>{{Nom}}</th>
-							<th>{{Options}}</th>
-							<th>{{Action}}</th>
-						</tr>
-					</thead>
-					<tbody>
+				<!-- <a class="btn btn-default btn-sm pull-right cmdAction" data-action="add" style="margin-top:5px;"><i class="fas fa-plus-circle"></i> {{Ajouter une commande}}</a> -->
+				<br><br>
+				<div class="table-responsive">
+					<table id="table_cmd" class="table table-bordered table-condensed">
+						<thead>
+							<tr>
+								<th class="hidden-xs" style="min-width:50px;width:70px;">ID</th>
+								<th style="min-width:500px;width:350px;">{{Nom}}</th>
+								<th>{{Type}}</th>
+								<th style="min-width:260px;">{{Options}}</th>
+								<th>{{Valeur}}</th>
+								<th style="min-width:80px;width:200px;">{{Actions}}</th>
+							</tr>
+						</thead>
+						<tbody>
 
-					</tbody>
-				</table>
+						</tbody>
+					</table>
+				</div>
 
 			</div>
 		</div>
@@ -228,4 +250,4 @@
 <!-- Inclusion du fichier javascript du plugin (dossier, nom_du_fichier, extension_du_fichier, id_du_plugin) -->
 <?php include_file('desktop', 'atlas', 'js', 'atlas'); ?>
 <!-- Inclusion du fichier javascript du core - NE PAS MODIFIER NI SUPPRIMER -->
-<?php include_file('core', 'plugin.template', 'js'); ?>
+<?php include_file('core', 'plugin.template', 'js'); ?>
\ No newline at end of file