diff --git a/web/public/js/components/messages/message-row.js b/web/public/js/components/messages/message-row.js
index 4593792e..93adabae 100644
--- a/web/public/js/components/messages/message-row.js
+++ b/web/public/js/components/messages/message-row.js
@@ -12,9 +12,17 @@ Vue.component("message-row", {
 			params: params
 		}
 	},
+	methods: {
+		viewCert: function (certId) {
+			teaweb.popup("/servers/certs/certPopup?certId=" + certId, {
+				height: "28em",
+				width: "48em"
+			})
+		}
+	},
 	template: `<div>
 <table class="ui table selectable">
-	<tr :class="{error: message.level == 'error'}">
+	<tr :class="{error: message.level == 'error', positive: message.level == 'success', warning: message.level == 'warning'}">
 		<td>
 			<strong>{{message.datetime}}</strong>
 			<span v-if="message.cluster != null && message.cluster.id != null">
@@ -27,7 +35,7 @@ Vue.component("message-row", {
 			</span>
 		</td>
 	</tr>
-	<tr :class="{error: message.level == 'error', positive: message.level == 'success'}">
+	<tr :class="{error: message.level == 'error', positive: message.level == 'success', warning: message.level == 'warning'}">
 		<td>
 			{{message.body}}
 			
@@ -40,6 +48,19 @@ Vue.component("message-row", {
 			<div v-if="message.type == 'ClusterDNSSyncFailed'" style="margin-top: 0.8em">
 				<a :href="'/dns/clusters/cluster?clusterId=' + message.cluster.id">查看问题 &raquo;</a>
 			</div>
+			
+			<!-- 证书即将过期 -->
+			<div v-if="message.type == 'SSLCertExpiring'" style="margin-top: 0.8em">
+				<a href="" @click.prevent="viewCert(params.certId)">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0">查看任务&raquo;</a>
+			</div>
+			
+			<!-- 证书续期成功 -->
+			<div v-if="message.type == 'SSLCertACMETaskSuccess'" style="margin-top: 0.8em">
+				<a href="" @click.prevent="viewCert(params.certId)">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0">查看任务&raquo;</a>
+			</div>
+			<div v-if="message.type == 'SSLCertACMETaskFailed'" style="margin-top: 0.8em">
+				<a href="" @click.prevent="viewCert(params.certId)">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0">查看任务&raquo;</a>
+			</div>
 		</td>
 	</tr>
 </table>
diff --git a/web/views/@default/servers/certs/acme/create.html b/web/views/@default/servers/certs/acme/create.html
index 7b7bcd04..fda844c1 100644
--- a/web/views/@default/servers/certs/acme/create.html
+++ b/web/views/@default/servers/certs/acme/create.html
@@ -24,7 +24,11 @@
 
 		<!-- 准备工作 -->
 		<div v-show="step == 'prepare'">
-			我们在申请免费证书的过程中需要自动增加或修改相关域名的TXT记录，请先确保你已经在"域名解析" -- <a href="/dns/providers" target="_blank">"DNS服务商"</a> 中已经添加了对应的DNS服务商账号。
+			<div>此流程用于免费申请一个新的证书。</div>
+			<div class="margin"></div>
+			<div>
+				我们在申请免费证书的过程中需要自动增加或修改相关域名的TXT记录，请先确保你已经在"域名解析" -- <a href="/dns/providers" target="_blank">"DNS服务商"</a> 中已经添加了对应的DNS服务商账号。
+			</div>
 
 			<div class="button-group">
 				<button type="button" class="ui button primary"  @click.prevent="doPrepare">下一步</button>
diff --git a/web/views/@default/servers/certs/acme/index.js b/web/views/@default/servers/certs/acme/index.js
index 2fa7b62b..1ca55cef 100644
--- a/web/views/@default/servers/certs/acme/index.js
+++ b/web/views/@default/servers/certs/acme/index.js
@@ -35,7 +35,7 @@ Tea.context(function () {
 	this.runTask = function (index, task) {
 		let that = this
 
-		teaweb.confirm("确定要立即执行此任务吗？", function () {
+		teaweb.confirm("html:确定要立即执行此任务吗？<br/>将会重新发起证书申请。", function () {
 			that.isRunning = true
 			that.runningIndex = index