diff --git a/views/css/d.poi.css b/views/css/d.poi.css
index d9c78a8..1b03f18 100755
--- a/views/css/d.poi.css
+++ b/views/css/d.poi.css
@@ -11,6 +11,11 @@ html, body {
 	min-height: 0;
 	top: 65%;
 	z-index: 10;
+    pointer-events: none;
+}
+
+#sticky * {
+    pointer-events: auto;
 }
 
 @keyframes fadeinfadeout {
@@ -38,6 +43,95 @@ html, body {
 	top: 0;
 }
 
+section.archive > * {
+	opacity: 0.5;
+}
+
+/* Comments of a poi */
+
+
+#new_comment {
+	clear: both;
+	margin: 30px auto 0 auto;
+	width: 90%;
+	background: #efefef;
+	border: 1px solid #ccc;
+	border-bottom: 3px solid #ccc;
+}
+#new_comment_label {
+	background: #ccc;
+	padding: 15px 10px;
+	cursor: pointer;
+	font-weight: 500;
+	font-size: 1.1em;
+}
+#new_comment_label p {
+	margin: 0;
+}
+#new_comment_label input {
+	display: none;
+	margin: -2px;
+	float: right;
+	padding: 5px 10px;
+	position: relative;
+	top: -7px;
+	width: 140px;
+}
+#new_comment_form {
+	display: none;
+}
+#new_comment_form textarea {
+	margin: 0;
+	border: 0;
+}
+#new_comment_label.sent {
+	cursor: default;
+}
+
+section article {
+	margin: 30px auto 0 auto;
+	width: 90%;
+	background: #efefef;
+	border: 1px solid #ccc;
+	border-bottom: 2px solid #ccc;
+	border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;	
+}
+section .comment_title {
+	background: #ccc;
+	padding: 5px 10px;
+}
+
+section .delete_link {
+	font-variant: small-caps;
+	font-weight: 500;
+	padding: 4px 0;
+	float: right;
+}
+
+section .icon {
+	border: 1px solid #999;
+	border-radius: 3px;
+	margin: 0 3px 0 3px;
+	padding: 4px 0;
+	line-height: 20px;
+	text-align: center;
+	width: 28px;
+	background: #ccc;
+	vertical-align: middle;
+}
+
+section .icon.avatar {
+	padding: 0;
+	height: 28px;
+}
+section .comment_content {
+	padding: 5px 10px;
+}
+section article.comment_archive {
+	opacity: 0.5;
+}
+
 /*********************************/
 /** Editor page                 **/
 /*********************************/
@@ -206,6 +300,8 @@ form.form input[type="checkbox"]:checked + span:before {
  Controls of the map
 *****************************************/
 
+
+
 /* General */
 
 .leaflet-control-container {
diff --git a/views/d.poi.edit.html b/views/d.poi.edit.html
index c1904be..f535e58 100755
--- a/views/d.poi.edit.html
+++ b/views/d.poi.edit.html
@@ -95,10 +95,10 @@ function updateForm(type) {
             case 'b':
                 var cls = 'intermediate';
                 var val = 1;
-                if (existing === 0 || existing === "0") {
+                if (existing == 0) {
                     cls = 'uncheck';
                     val = 0;
-                } else if (existing === 2 || existing === "2") {
+                } else if (existing == 2) {
                     cls = 'check';
                     val = 2;
                 }
@@ -121,7 +121,8 @@ function updateForm(type) {
 
             case 't':
                 html_form +=
-                    '<textarea name="' + index + '" id="' + index + '" placeholder="' + value + '">';
+                    '<label for="' + index + '">' + value + '</label>' +
+                    '<textarea name="' + index + '" id="' + index + '">';
                 if (existing !== null) {
                     html_form += String(existing)
                         .replace(/&/g, "&amp;")
@@ -160,6 +161,10 @@ $(document).ready(function(){
         updateForm(current_poi_type);
     }
 
+		if (poi_mode === "edit") {
+		    unsaved = true;
+		}
+
 		$('#type_selector label').click(function(){
 
 		    if (unsaved === true) {
diff --git a/views/d.poi.view.html b/views/d.poi.view.html
index 76dece3..bf0eb34 100644
--- a/views/d.poi.view.html
+++ b/views/d.poi.view.html
@@ -10,7 +10,7 @@
 		<div id="mapid"></div>
 
 		<div id="sticky">
-			<section>
+			<section <?=$poi->is_archive=="t"||$poi->is_public=="f"?'class="archive"':''?>>
 				<i id="slide-icon" class="fas fa-chevron-up"></i>
 
                 <h1 class="flex_line">
@@ -147,9 +147,9 @@
                                 <?php
                                     $value = $values[$key] ?? -1;
                                     $icon = [
-                                        1  => "<span class='boolean-pill boolean-yes'>✔️</span>",
+                                        -1  => "<span class='boolean-pill boolean-yes'>✔️</span>",
                                         0  => "<span class='boolean-pill boolean-no'>❌</span>",
-                                        -1 => "<span class='boolean-pill boolean-unknown'>❓</span>"
+                                        1 => "<span class='boolean-pill boolean-unknown'>❓</span>"
                                     ][$value];
                                 ?>
                                 <div class="bool-cell">
@@ -165,44 +165,74 @@
 
 
 				<? if ($poi->is_commentable == 't') { ?>
-					<h2>Commentaires</h2>
+                    <div id="new_comment">
+                        <form class="form" action="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/new_comment" method="post">
+                            <div id="new_comment_label" <?=$user->rank=="visitor"?"class='sent' ":""?>>
+                                <? if ($poi->is_archive == "t" || $poi->is_public == "f") { ?>
+                                    <p>Impossible de commenter un point non publié</p>
+                                <? } else if ($user->rankIsHigher("registered")) { ?>
+                                    <input name="submit" type="submit" value="Envoyer">
+                                    <p>Ajouter un nouveau commentaire</p>
+                                <? } else { ?>
+                                    <p>Veuillez vous connecter pour ajouter un commentaire</p>
+                                <? } ?>
+                            </div>
+                            <div id="new_comment_form">
+                                <textarea id="comment" name="comment" rows="5" placeholder="Votre commentaire"></textarea>
+                            </div>
+                        </form>
+                    </div>
 
 					<? if (isset($poi_comments) && $poi_comments->number > 0) { ?>
 						<div id="comments">
 							<? foreach ($poi_comments->objs as $comment) { ?>
-								<article class="comment">
-									<header>
-										<strong><?=$comment->author_obj->name?></strong>
-										<span><?=$comment->creation_date?></span>
+								<article <? if($comment->is_archive == 't' || $comment->is_public == 'f') echo 'class="comment_archive" '; ?>>
+                                    <div class="comment_title">
 
-										<? if ($user->rankIsHigher("moderator") || $user->id == $comment->author) { ?>
-											<? if ($comment->is_public == 't') { ?>
-												<a href="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/delete_comment/<?=$comment->id?>">Supprimer</a>
-											<? } else { ?>
-												<a href="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/restore_comment/<?=$comment->id?>">Restaurer</a>
-											<? } ?>
-										<? } ?>
-									</header>
+                                        <? if ($comment->author_obj->is_avatar_present == 't') { ?>
+                                            <img alt="Avatar" class="icon avatar" src="<?=$config['rel_root_folder']?>medias/avatars/<?=$comment->author_obj->id?>_s.jpg">
+                                        <? } else { ?>
+                                            <i class="icon fas fa-user-secret"></i>
+                                        <? } ?>
+
+                                        <? if ($user->rankIsHigher("blocked")) { ?>
+                                            <a class="username" href="<?=$config['rel_root_folder']?>user/p/<?=$comment->author_obj->id?>">
+                                                <?=$comment->author_obj->name?>
+                                            </a>
+                                        <? } else { ?>
+                                            <?=$comment->author_obj->name?>
+                                        <? } ?>
+
+                                        le <? echo datefmt_format($user->datetime_format, date_create($comment->update_date, new DateTimeZone("UTC"))) ?>
+
+                                        <? if (($user->rankIsHigher("moderator") || $user->id == $comment->author) && $comment->is_public == 't') { ?>
+                                            <span class="delete_link">
+                                                <a href="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/delete_comment/<?=$comment->id?>">
+                                                    <i class="fas fa-trash"></i> Effacer le commentaire
+                                                </a>
+                                            </span>
+                                        <? } ?>
+
+                                        <? if (($user->rankIsHigher("moderator") || $user->id == $comment->author) && $comment->is_public == 'f') { ?>
+                                            <span class="delete_link">
+                                                <a href="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/restore_comment/<?=$comment->id?>">
+                                                    <i class="fas fa-eye"></i> Restaurer le commentaire
+                                                </a>
+                                            </span>
+                                        <? } ?>
+
+                                    </div>
+
+                                    <div class="comment_content">
+                                        <?=$comment->comment_html?>
+                                    </div>
+                                </article>
 
-									<div class="comment-body">
-										<?=$comment->comment_html?>
-									</div>
-								</article>
 							<? } ?>
-						</div>
+						<br></div>
 					<? } else { ?>
 						<p>Aucun commentaire pour le moment.</p>
 					<? } ?>
-
-					<? if ($user->rankIsHigher("registered")) { ?>
-						<form class="form" action="<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/new_comment" method="post">
-							<h3>Ajouter un commentaire</h3>
-							<textarea name="comment" id="comment" required></textarea>
-							<input type="submit" name="submit" value="Envoyer">
-						</form>
-					<? } else { ?>
-						<p>Connectez-vous pour ajouter un commentaire.</p>
-					<? } ?>
 				<? } ?>
 
 			</section>
@@ -218,6 +248,24 @@
             var root = "<?=$config['rel_root_folder']?>";
 		</script>
 
+<? if($user->rankIsHigher("premium")) { ?>
+        <script type="text/javascript">
+$( "#PoiHistory" ).change(function() {
+  window.location.href = "<?=$config['rel_root_folder']?>poi/<?=$poi->permalink?>/"+$( this ).val();
+});
+        </script>
+<? } ?>
+
+<? if($user->rankIsHigher("registered") && $poi->is_archive == "f" && $poi->is_public == "t") { ?>
+        <script type="text/javascript">
+$( "#new_comment_label" ).click(function() {
+  $( "#new_comment_form" ).show(400);
+  $( "#new_comment_label input" ).show(0);
+  $( "#new_comment_label").addClass('sent');
+});
+        </script>
+<? } ?>
+
 		<script type="text/javascript">
 			$( "#slide-icon" ).click(function() {
 				$( "html, body" ).animate({scrollTop: "300px"});