--- wikisrc/templates/page.tmpl	2010/07/03 19:10:31	1.9
+++ wikisrc/templates/page.tmpl	2010/07/03 23:31:47	1.10
@@ -94,14 +94,10 @@
 <TMPL_VAR CONTENT>
 </div>
 
+<TMPL_UNLESS DYNAMIC>
 <div id="comments">
-<hr />
 <TMPL_IF NAME="COMMENTEDITURL">
-<a href="<TMPL_VAR COMMENTEDITURL>" rel="nofollow">Edit</a><br />
-<TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
-<TMPL_VAR DISCUSSIONLINK><br />
-</TMPL_IF>
+<h3><a href="<TMPL_VAR COMMENTEDITURL>" rel="nofollow">Discussion</a></h3>
 </TMPL_IF>
 <TMPL_IF COMMENTS>
 <TMPL_VAR COMMENTS>
@@ -114,6 +110,7 @@
 </TMPL_IF>
 </div>
 </TMPL_IF>
+</TMPL_UNLESS>
 
 		      </TMPL_IF>
 
@@ -165,11 +162,9 @@ Last edited <TMPL_VAR MTIME>
 </div>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
 <TMPL_IF NAME="PREFSURL">
 <a href="<TMPL_VAR PREFSURL>">Preferences | Logout</a>
 </TMPL_IF>
-</div>
 </TMPL_IF>
 
 </div><!-- #pageinfo -->