diff --git a/libs/cbi/luasrc/view/cbi/map.htm b/libs/cbi/luasrc/view/cbi/map.htm
index 1238b6adb0..6378f72abf 100644
--- a/libs/cbi/luasrc/view/cbi/map.htm
+++ b/libs/cbi/luasrc/view/cbi/map.htm
@@ -16,19 +16,21 @@ $Id$
 <div class="cbi-map" id="cbi-<%=self.config%>">
 	<h1><%=self.title%></h1>
 	<div class="cbi-map-descr"><%=self.description%></div>
-	<%- if self._apply then -%><code><%:cbi_applying%>:
-	
-<% 
-			local fp = self._apply()
-			self._apply = nil
-			local line = fp:read()
-			while line do
-				write(line.."\n")
-				line = fp:read()
-			end
-			fp:close()
-		-%>
-	</code><%- end -%>
+	<%- if self._apply then -%>
+		<fieldset class="cbi-section">
+			<legend><%:cbi_applying%></legend>
+			<ul class="cbi-apply"><%-
+				local fp = self._apply()
+				self._apply = nil
+				local line = fp:read()
+				while line do
+					write("<li>" .. luci.util.pcdata(line) .. "</li>\n")
+					line = fp:read()
+				end
+				fp:close()
+			-%></ul>
+		</fieldset>
+	<%- end -%>
 	<%- self:render_children() %>
 	<br />
 </div>
diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
index 4663ff5831..7deeaebeab 100644
--- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
+++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
@@ -507,6 +507,10 @@ td.cbi-value-error {
 	padding: 3px;
 }
 
+ul.cbi-apply {
+	font-size: 90%;
+}
+
 .right {
 	text-align: right;
 }
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
index dd6fe5e9bf..064b4e63c8 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
@@ -492,6 +492,10 @@ td.cbi-value-error {
 	padding: 3px;
 }
 
+ul.cbi-apply {
+	font-size: 90%;
+}
+
 .right {
 	text-align: right;
 }
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index bc01339e7e..3f44f202e2 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -222,6 +222,10 @@ div#content ul {
 	background-color: inherit;
 }
 
+ul.cbi-apply {
+	font-size: 90%;
+}
+
 input[type=submit],
 input[type=reset],
 input[type=image],