diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 13ccb27cb0b..6148ed5d5f7 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -82,6 +82,8 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
 		setEventMessage($object->error,'errors');
 		$action='';
 	}else {
+		if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings');
+		else setEventMessage($langs->trans("JobFinished"),'mesgs');
 		$action='';
 	}
 
@@ -194,10 +196,13 @@ if ($action=='inactive') {
 
 llxHeader('',$langs->trans("CronAdd"));
 
-if ($action=='edit' || empty($action) || $action=='delete' || $action=='execute') {
+if ($action=='edit' || empty($action) || $action=='delete' || $action=='execute')
+{
 	$head=cron_prepare_head($object);
 	dol_fiche_head($head, 'card', $langs->trans("CronTask"), 0, 'bill');
-} elseif ($action=='create') {
+}
+elseif ($action=='create')
+{
 	print_fiche_titre($langs->trans("CronTask"),'','setup');
 }
 
@@ -251,8 +256,8 @@ if (empty($object->status) && $action != 'create')
 	dol_htmloutput_mesg($langs->trans("CronTaskInactive"),'','warning',1);
 }
 
-if (($action=="create") || ($action=="edit")) {
-
+if (($action=="create") || ($action=="edit"))
+{
 	print '<form name="cronform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 	if (!empty($object->id)) {
@@ -565,6 +570,10 @@ if (($action=="create") || ($action=="edit")) {
 
 	print '</table>';
 
+
+	dol_fiche_end();
+
+
 	print "\n\n<div class=\"tabsAction\">\n";
 	if (! $user->rights->cron->create) {
 		print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Edit").'</a>';
@@ -585,9 +594,15 @@ if (($action=="create") || ($action=="edit")) {
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
 		}
 	}
-	if ((! $user->rights->cron->execute) || (empty($object->status))) {
+	if ((empty($user->rights->cron->execute)))
+	{
 		print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronExecute").'</a>';
-	} else {
+	}
+	else if (empty($object->status))
+	{
+		print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("TaskDisabled")).'">'.$langs->trans("CronExecute").'</a>';
+	}
+	else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.'">'.$langs->trans("CronExecute").'</a>';
 	}
 	print '<br><br></div>';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index db36cc5d59b..efed9579d1f 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -203,7 +203,7 @@ if (count($object->lines)>0) {
 
 		print '<td>';
 		if(!empty($line->label)) {
-			print '<a href="'.dol_buildpath('/cron/cron/card.php',1).'?id='.$line->id.'">'.$line->label.'</a>';
+			print '<a href="'.DOL_URL_ROOT.'/cron/card.php?id='.$line->id.'">'.$line->label.'</a>';
 		}
 		else {
 			print $langs->trans('CronNone');
@@ -229,19 +229,19 @@ if (count($object->lines)>0) {
 		print '</td>';
 
 		print '<td>';
-		if(!empty($line->datestart)) {print dol_print_date($line->datestart,'dayhourtext');} else {print $langs->trans('CronNone');}
+		if(!empty($line->datestart)) {print dol_print_date($line->datestart,'dayhour');} else {print $langs->trans('CronNone');}
 		print '</td>';
 
 		print '<td>';
-		if(!empty($line->dateend)) {print dol_print_date($line->dateend,'dayhourtext');} else {print $langs->trans('CronNone');}
+		if(!empty($line->dateend)) {print dol_print_date($line->dateend,'dayhour');} else {print $langs->trans('CronNone');}
 		print '</td>';
 
 		print '<td>';
-		if(!empty($line->datelastrun)) {print dol_print_date($line->datelastrun,'dayhourtext');} else {print $langs->trans('CronNone');}
+		if(!empty($line->datelastrun)) {print dol_print_date($line->datelastrun,'dayhour');} else {print $langs->trans('CronNone');}
 		print '</td>';
 
 		print '<td>';
-		if(!empty($line->datenextrun)) {print dol_print_date($line->datenextrun,'dayhourtext');} else {print $langs->trans('CronNone');}
+		if(!empty($line->datenextrun)) {print dol_print_date($line->datenextrun,'dayhour');} else {print $langs->trans('CronNone');}
 		print '</td>';
 
 		print '<td>';
@@ -283,13 +283,22 @@ if (count($object->lines)>0) {
 	print $langs->trans('CronNoJobs');
 }
 
-print "\n\n<div class=\"tabsAction\">\n";
-if (! $user->rights->cron->create) {
+print "\n<div class=\"tabsAction\">\n";
+
+if (! $user->rights->cron->create)
+{
 	print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("New").'</a>';
-} else {
-	print '<a class="butAction" href="'.dol_buildpath('/cron/card.php',1).'?action=create">'.$langs->trans("New").'</a>';
 }
-print '<br><br></div>';
+else
+{
+	print '<a class="butAction" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("New").'</a>';
+}
+
+print '</div>';
+
+print '<br>';
 
 llxFooter();
-$db->close();
\ No newline at end of file
+
+$db->close();
+?>
\ No newline at end of file