diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index bc8aa3a9b39..8b1469dd446 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1282,7 +1282,7 @@ class FormFile
 					$sizetoshow = dol_print_size($file['size'], 1, 1);
 					$sizetoshowbytes = dol_print_size($file['size'], 0, 1);
 
-					print '<td class="right" style="width: 80px">';
+					print '<td class="right nowraponall">';
 					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
 					else {
 						print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
@@ -1317,7 +1317,7 @@ class FormFile
 							} else {
 								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 							}
-							print '<img class="photo" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
+							print '<img class="photo maxwidth200" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
 						}
 						else print '&nbsp;';
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index ff0fdcae67e..6c4d32bc1cb 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -72,6 +72,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 	$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
 	$aliascontent .= '?>'."\n";
 	$result = file_put_contents($filealias, $aliascontent);
+	if ($result === false) {
+		dol_syslog("Failed to write file ".$filealias, LOG_WARNING);
+	}
 	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filealias, octdec($conf->global->MAIN_UMASK));
 	}
@@ -89,6 +92,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 		$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
 		$aliascontent .= '?>'."\n";
 		$result = file_put_contents($filealias, $aliascontent);
+		if ($result === false) {
+			dol_syslog("Failed to write file ".$filealias, LOG_WARNING);
+		}
 		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($filealias, octdec($conf->global->MAIN_UMASK));
 		}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index e89409190be..9f823935bcb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1765,7 +1765,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				// Now generate the master.inc.php page
 				$result = dolSaveMasterFile($filemaster);
 
-				if (!$result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+				if (!$result) setEventMessages('Failed to write the master file file '.$filemaster, null, 'errors');
 
 
 				// Now generate the alias.php page
@@ -1777,7 +1777,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 				// Save page alias
 				$result = dolSavePageAlias($filealias, $object, $objectpage);
-				if (!$result) setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
+				if (!$result) setEventMessages('Failed to write the alias file '.basename($filealias), null, 'errors');
 
 				// Save page content
 				$result = dolSavePageContent($filetpl, $object, $objectpage);
@@ -3485,8 +3485,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
 			print getTitleFieldOfList("Type", 0, $_SERVER['PHP_SELF'], 'type_container', '', $param, '', $sortfield, $sortorder, '')."\n";
-			print getTitleFieldOfList("Link", 0, $_SERVER['PHP_SELF'], 'pageurl', '', $param, '', $sortfield, $sortorder, '')."\n";
-			print getTitleFieldOfList("Description", 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '')."\n";
+			print getTitleFieldOfList("Page", 0, $_SERVER['PHP_SELF'], 'pageurl', '', $param, '', $sortfield, $sortorder, '')."\n";
+			//print getTitleFieldOfList("Description", 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '')."\n";
 			print getTitleFieldOfList("", 0 , $_SERVER['PHP_SELF']);
 			print '</tr>';
 
@@ -3501,8 +3501,11 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
 					print '<td>';
 					print $answerrecord->getNomUrl(1);
 					print ' <span class="opacitymedium">('.($answerrecord->title ? $answerrecord->title : $langs->trans("NoTitle")).')</span>';
+					//print '</td>';
+					//print '<td class="tdoverflow100">';
+					print '<br>';
+					print '<span class="opacitymedium">'.$answerrecord->description.'</span>';
 					print '</td>';
-					print '<td class="tdoverflow100">'.$answerrecord->description.'</td>';
 					print '<td>';
 					$param = '?action=replacesiteconfirm';
 					$param .= '&websiteid='.$website->id;