Index: /branches/release-35/mt-static/css/structure.css
===================================================================
--- /branches/release-35/mt-static/css/structure.css (revision 1966)
+++ /branches/release-35/mt-static/css/structure.css (revision 1988)
@@ -2051,5 +2051,6 @@
 }
 
-#list-template .listing-header {
+#list-template .listing-header,
+#list-widget-set .listing-header {
     padding: 10px 8px 6px;
 }
@@ -2222,4 +2223,6 @@
 .listing .status-unlinked img { background-image: url(../images/status_icons/neutral.gif); }
 .listing .status-linked img { background-image: url(../images/status_icons/success.gif); }
+.listing .status-uncached img { background-image: url(../images/status_icons/neutral.gif); }
+.listing .status-cached img { background-image: url(../images/status_icons/success.gif); }
 .listing .status-dynamic img { background-image: url(../images/status_icons/success.gif); }
 .listing .status-static img { background-image: url(../images/status_icons/neutral.gif); }
Index: /branches/release-35/tmpl/cms/include/template_table.tmpl
===================================================================
--- /branches/release-35/tmpl/cms/include/template_table.tmpl (revision 1878)
+++ /branches/release-35/tmpl/cms/include/template_table.tmpl (revision 1988)
@@ -60,5 +60,8 @@
         </mt:unless>
         <mt:if name="template_type" like="/(index|archive)/">
-                <th class="publishing-method"><!-- <img src="<mt:var name="static_uri">images/status_icons/dynamic.gif" alt="<__trans phrase="Dynamic Template">" title="<__trans phrase="Publishing Method">" width="11" height="9" /> --><__trans phrase="Publishing"></th>
+                <th class="publishing-method"><__trans phrase="Publishing"></th>
+        </mt:if>
+        <mt:if name="template_type" eq="module">
+                <th class="cache-method"><__trans phrase="Cached"></th>
         </mt:if>
         <mt:unless name="screen_id" eq="search-replace">
@@ -80,5 +83,5 @@
             <mt:loop name="archive_types">
                 <mt:loop name="archive_tmpl_loop">
-                        <li><mt:if name="selected"><mt:var name="name" escape="html"><mt:var name="build_type" value="$map_build_type"></mt:if></li>
+                        <mt:if name="selected"><li><mt:var name="name" escape="html"><mt:var name="build_type" value="$map_build_type"></li></mt:if>
                 </mt:loop>
             </mt:loop>
@@ -101,10 +104,11 @@
                     <mt:else><__trans phrase="Static"></mt:if>
                 </td>
-    <mt:elseif name="template_type" eq="archive">
+    <mt:else name="template_type" eq="archive">
                 <td class="publishing-method">
                     <ul>
             <mt:loop name="archive_types">
                 <mt:loop name="archive_tmpl_loop">
-                        <li><mt:if name="selected">
+                    <mt:if name="selected">
+                        <li>
                     <mt:if name="map_build_type" eq="0"><__trans phrase="Manual">
                     <mt:elseif name="map_build_type" eq="2"><__trans phrase="Manual">
@@ -112,9 +116,13 @@
                     <mt:elseif name="map_build_type" eq="4"><__trans phrase="Background">
                     <mt:elseif name="map_build_type" eq="5"><__trans phrase="Scheduled">
-                    <mt:else><__trans phrase="Static"></mt:if></mt:if></li>
+                    <mt:else><__trans phrase="Static"></mt:if>
+                        </li>
+                    </mt:if>
                 </mt:loop>
             </mt:loop>
                     </ul>
                 </td>
+    <mt:else name="template_type" eq="module">
+                <td class="cache-method si status-<mt:if name="cache_enabled">cached<mt:else>uncached</mt:if>"><img src="<mt:var name="static_uri">images/spacer.gif" alt="" width="9" height="9" title="" /><mt:if name="cache_enabled">cached<mt:else>uncached</mt:if></td>
     </mt:if>
     <mt:unless name="screen_id" eq="search-replace">