Index: openacs-4/packages/assessment/lib/section-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/assessment/lib/section-items.adp	15 May 2007 20:14:16 -0000	1.20
+++ openacs-4/packages/assessment/lib/section-items.adp	31 Jan 2008 16:06:26 -0000	1.21
@@ -1,38 +1,39 @@
 <formtemplate id="admin_section">
 <if @items:rowcount@ eq 0>
-    <a href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Add_New#</a>
-    <a href="catalog-search?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Search_Item#</a>
+    <div>
+    <a href="@item_add_url@">#assessment.Add_New#</a>
+    <a href="@catalog_search_url@">#assessment.Search_Item#</a>
+    </div>
 </if>
 
 <multiple name="items">
 
-<a name="Q@items.as_item_id@"><h4>#assessment.Question_Number#</h4>
+<h4><a name="Q@items.as_item_id@">#assessment.Question_Number#</a></h4>
 
 <if @assessment_data.type@ ne 1>
 
-    <a class="button" href="item-edit-general?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a>
-    <a class="button" href="item-copy?section_id=@section_id@&assessment_id=@assessment_id@&as_item_id=@items.as_item_id@&after=@items.sort_order@">#assessment.Copy#</a>
-<a class=button href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Add_New#</a>
-
-<a class=button href="catalog-search?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Search_Item#</a>
-    <img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
-<if @items.rownum@ lt @items:rowcount@>
-    <a href="item-swap?section_id=@section_id@&assessment_id=@assessment_id@&sort_order=@items.sort_order@&direction=down"><img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#"></a>
-</if>
+    <div><a class="button" href="@item_edit_general_url@">#assessment.Edit#</a>
+    <a class="button" href="@item_copy_url@">#assessment.Copy#</a>
+    <a class=button href="@item_add_url@">#assessment.Add_New#</a>
+    <a class=button href="@catalog_search_url@">#assessment.Search_Item#</a>
+    <img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">
+    <if @items.rownum@ lt @items:rowcount@>
+        <a href="@item_swap_down_url@"><img src="/resources/assessment/down.gif" style="border: 0;" alt="#assessment.Move_Down#"></a>
+    </if>
     <if @items.rownum@ gt 1>
-   <a href="item-swap?section_id=@section_id@&assessment_id=@assessment_id@&sort_order=@items.sort_order@&direction=up"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
- </if>
-<a href="item-delete?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@"><img src="/resources/acs-subsite/Delete16.gif" border="0" alt="#assessment.remove_item#"></a>
+        <a href="@item_swap_up_url"><img src="/resources/assessment/up.gif" style="border: 0;" alt="#assessment.Move_Up#"></a>
+    </if>
+    <a href="@item_delete_url@"><img src="/resources/acs-subsite/Delete16.gif" style="border: 0;" alt="#assessment.remove_item#"></a>
 
+    <if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
+    (@items.points@ #assessment.points#)
+    <if @items.item_type@ eq "mc" and @admin_trigger_p@>
+    <a class=button href="@add_edit_check_url@">#assessment.add_trigger#</a> (<a href="@check_admin_url@">@items.checks_related@</a>)<img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">
+    </if>
+    </div>
 
-<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
-(@items.points@ #assessment.points#)
-<if @items.item_type@ eq "mc" and @admin_trigger_p@>
-<a class=button href="../asm-admin/add-edit-check?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.add_trigger#</a> (<a href="../asm-admin/checks-admin?section_id=@items.section_id@&assessment_id=@assessment_id@&item_id=@items.as_item_id@">@items.checks_related@</a>)<img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
-</if>
-
     <if @items.presentation_type@ ne fitb><p>@items.question_text;noquote@</p>
-
+<div>
 <if @items.description@ not nil>@items.description;noquote@<br></if></if>
 
     <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
@@ -54,9 +55,10 @@
     <else>
       <formwidget id="response_to_item.@items.as_item_id@">
     </else>
+</div>
     <if @items.subtext@ not nil>
       <div class="form-help-text">
-      <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+      <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" style="border: 0;">
       <noparse>@items.subtext@</noparse>
       </div>
     </if>
Index: openacs-4/packages/assessment/lib/section-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/assessment/lib/section-items.tcl	15 May 2007 20:14:16 -0000	1.12
+++ openacs-4/packages/assessment/lib/section-items.tcl	31 Jan 2008 16:06:26 -0000	1.13
@@ -3,7 +3,23 @@
     {section_id:text(hidden) {value $section_id}}
 }
 
-db_multirow -extend { checks_related presentation_type html item_type choice_orientation } items section_items {} {
+set item_add_url [export_vars -base item-add {section_id assessment_id {after 0}}]
+set catalog_search_url [export_vars -base catalog-search {section_id assessment_id {after 0}}]
+
+db_multirow -extend { checks_related presentation_type html item_type choice_orientation item_edit_general_url item_copy_url catalog_search_url item_swap_url add_edit_check_url check_admin_url } items section_items {} {
+
+    # Build URLs
+    set item_edit_general_url [export_vars -base item-edit-general {as_item_id section_id assessment_id}]
+    set item_copy_url [export_vars -base item-copy {section_id assessment_id as_item_id {after $sort_order}}]
+    set item_add_url [export_vars -base item-add {section_id assessment_id {after $sort_order}}]
+    set catalog_search_url [export_vars -base catalog-search {section_id assessment_id {after $sort_order}}]
+    set item_swap_down_url [export_vars -base item-swap {section_id assessment_id sort_order {direction down}}]
+    set item_swap_up_url [export_vars -base item-swap {section_id assessment_id sort_order {direction up}}]
+    set item_delete_url [export_vars -base item-swap {as_item_id section_id assessment_id}]
+    set add_edit_check_url [export_vars -base ../asm-admin/add-edit-check {as_item_id section_id assessment_id {after $sort_order}}]
+    set check_admin_url [export_vars -base ../asm-admin/checks-admin {section_id assessment_id {item_id $as_item_id}}]
+
+
     set presentation_type [as::item_form::add_item_to_form -name admin_section -section_id $section_id -item_id $as_item_id -random_p f]
     if {$presentation_type == "fitb"} {
         regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/asm-action-admin.adp	14 Feb 2005 23:26:49 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.adp	31 Jan 2008 16:06:26 -0000	1.6
@@ -3,6 +3,6 @@
 <property name="context">@context;noquote@</property>
 
 <blockquote>
-<listtemplate name="actions"></listtemplate><br>
-<a href=asm-action-new>#assessment.add_new_action#</a>
+<listtemplate name="actions"></listtemplate>
+<div><a href=asm-action-new>#assessment.add_new_action#</a></div>
 </blockquote>
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/asm-action-admin.tcl	14 Feb 2005 23:26:48 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.tcl	31 Jan 2008 16:06:26 -0000	1.6
@@ -22,8 +22,8 @@
 	    label {[_ assessment.action_edit]}
 	    display_template {
 
-		<a href=asm-action-new?action_id=@actions.action_id@>[_ assessment.Edit]</a>
-		| <a href=asm-action-delete?action_id=@actions.action_id@>[_ assessment.Delete]</a>
+		<a href="asm-action-new?action_id=@actions.action_id@">[_ assessment.Edit]</a>
+		| <a href="asm-action-delete?action_id=@actions.action_id@">[_ assessment.Delete]</a>
 	    }
 	}
     }
Index: openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.tcl	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/add-edit-section-check.tcl	31 Jan 2008 16:06:26 -0000	1.3
@@ -69,7 +69,7 @@
         }
         {description:text(textarea)
             {label "[_ assessment.action_description]"}
-            {html {cols 40} {rows 20}}
+            {html {cols 40 rows 20}}
             {help_text "[_ assessment.description_trigger]"}
         }
         {action_p:text(hidden)
Index: openacs-4/packages/assessment/www/asm-admin/admin-request.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/admin-request.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/admin-request.adp	4 Feb 2005 21:14:22 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/admin-request.adp	31 Jan 2008 16:06:26 -0000	1.2
@@ -2,7 +2,7 @@
 <property name="title">#assessment.Request# #assessment.Administration#</property>
 <property name="context_bar">@context;noquote@</property>
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 function get_interval() {
         interval=document.interval.date.value; 
@@ -33,9 +33,9 @@
 }
 
 </script>
-      <table bgcolor="#cccccc" cellpadding="5" width="95%">
-	<tr bgcolor="#eeeeee">
-       	  <th align="left" width="50%">
+      <table style="background-color: #cccccc;" cellpadding="5" width="95%">
+	<tr style="background-color: #eeeeee;">
+       	  <th align="left" style="width:50%">
            <formtemplate id="assessments"></formtemplate>
           </th>
           <th>
Index: openacs-4/packages/assessment/www/asm-admin/assessment-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-history.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/assessment-history.tcl	26 Sep 2006 00:22:46 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/assessment-history.tcl	31 Jan 2008 16:06:26 -0000	1.3
@@ -40,7 +40,7 @@
 	}
 	creation_date {
 	    label {[_ assessment.Modified_Time]}
-	    html {nowrap}
+	    html {style white-space:nowrap}
 	}
     } -main_class {
 	narrow
Index: openacs-4/packages/assessment/www/asm-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/assessment/www/asm-admin/index.adp	15 May 2007 20:14:17 -0000	1.10
+++ openacs-4/packages/assessment/www/asm-admin/index.adp	31 Jan 2008 16:06:26 -0000	1.11
@@ -4,9 +4,9 @@
 <if @package_admin_p@ eq 1>
 <a
 href="@categories_url@cadmin/one-object?object_id=@package_id@">#assessment.admin_categories#</a>
-|<if @sw_admin_p@ eq 1> <a href=../admin/asm-action-admin>#assessment.admin_actions#</a> |</if> <a href=../asm-admin/admin-request>#assessment.admin_requests#</a> | <a href="permissions?object_id=@package_id@">#assessment.permissions#</a> | <a href="sessions">#assessment.View_Sessions#</a>
+|<if @sw_admin_p@ eq 1> <a href="../admin/asm-action-admin">#assessment.admin_actions#</a> |</if> <a href="../asm-admin/admin-request">#assessment.admin_requests#</a> | <a href="permissions?object_id=@package_id@">#assessment.permissions#</a> | <a href="sessions">#assessment.View_Sessions#</a>
 </if> <else>
-<a href=../asm-admin/admin-request>#assessment.admin_requests#</a>
+<a href="../asm-admin/admin-request">#assessment.admin_requests#</a>
 </else>
 
 <p>
Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	19 Dec 2007 11:55:07 -0000	1.16
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	31 Jan 2008 16:06:26 -0000	1.17
@@ -29,7 +29,7 @@
 
 set page_title [_ assessment.add_item]
 set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title]
-template::head:add_style -style ".form-label {text-align:left;} .form-label label {font-weight:bold;}"
+template::head::add_style -style ".form-label {text-align:left;} .form-label label {font-weight:bold;}"
 set package_id [ad_conn package_id]
 
 set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]]
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	7 Oct 2007 22:36:54 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	31 Jan 2008 16:06:26 -0000	1.5
@@ -3,16 +3,16 @@
 <property name="context">@context;noquote@</property>
 
 <formtemplate id="item_edit_general">
-  <formwidget id="__confirmed_p"><formwidget id="__refreshing_p"><formwidget id="assessment_id"><formwidget id="section_id"><formwidget id="__key_signature"><formwidget id="__new_p"><formwidget id="as_item_id">
-      <br/>
-        
+  <div><formwidget id="__confirmed_p"><formwidget id="__refreshing_p"><formwidget id="assessment_id"><formwidget id="section_id"><formwidget id="__key_signature"><formwidget id="__new_p"><formwidget id="as_item_id">
+      <br></div>
+            <div>
               <if @formerror.question_text@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="question_text">
               Question
             </label>
@@ -34,14 +34,13 @@
               <br>
                   @formerror.question_text;noquote@
             </formerror>
-          
+         </span></div>
             <p class="form-help-text">
               
                 <formhelp id="question_text">
-              
+            </p>
 
-        </span>   
-         
+        <div>
               <if @formerror.required_p@ not nil>
                 <span class="form-label-error">
               </if>
@@ -70,15 +69,14 @@
               <br>
                   @formerror.required_p;noquote@
             </formerror>
-          
+        </span></div>
             <p class="form-help-text">
               
                 <formhelp id="required_p">
-              
+            </p>
 
-        </span>   
         
-      <br/>
+      <div><br>
         
               <if @formerror.points@ not nil>
                 <span class="form-label-error">
@@ -108,16 +106,14 @@
               <br>
                   @formerror.points;noquote@
             </formerror>
-          
+          </span></div>
             <p class="form-help-text">
               
                 <formhelp id="points">
-              
+            </p>
 
-        </span>   
+      <div><br>
         
-      <br/>
-        
               <if @formerror.feedback_right@ not nil>
                 <span class="form-label-error">
               </if>
@@ -146,16 +142,15 @@
               <br>
                   @formerror.feedback_right;noquote@
             </formerror>
-          
+        </span></div>
             <p class="form-help-text">
               
                 <formhelp id="feedback_right">
-              
+            </p>
 
-        </span>   
+
+      <div><br>
         
-      <br/>
-        
               <if @formerror.feedback_wrong@ not nil>
                 <span class="form-label-error">
               </if>
@@ -184,33 +179,32 @@
               <br>
                   @formerror.feedback_wrong;noquote@
             </formerror>
-          
+        </span></div>
             <p class="form-help-text">
               
                 <formhelp id="feedback_wrong">
-              
-
-        </span>   
-       <br />
+            </p>
+       <div><br></div>
 <if @item_type@ eq "mc">
                       
-            <br /><formgroup-widget id="display_type" row=1></formgroup-widget>
-            <br /><formgroup-widget id="display_type" row=2></formgroup-widget>
+            <div><br><formgroup-widget id="display_type" row=1></formgroup-widget></div>
+            <div><br><formgroup-widget id="display_type" row=2></formgroup-widget></div>
 
             <if @formerror.display_type@ not nil>
-              <span class="form-widget-error">
+              <span class="form-widget-error"></span>
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget"></span>
             </else>
                      
             <formerror id="display_type">
                   @formerror.data_type;noquote@
             </formerror>
-          
+
             <p class="form-help-text">
               
                 <formhelp id="display_type">
+            </p>
 </if>                      
 
 <switch @item_type@>
@@ -234,11 +228,11 @@
         </if>
         <formwidget id="delete.@choice_elements.id@">
 </if>
-    <br />
+    <br>
 </multiple>
-<formwidget id="save_answer_set"> <label for="save_answer_set">#assessment.Save_this_set_of_answers_for_reuse_later#</label><br />
-<formwidget id="add_another_choice"><br />
-<if @choice_sets@ not nil><p>#assessment.OrUseChoices#<br />
+<formwidget id="save_answer_set"> <label for="save_answer_set">#assessment.Save_this_set_of_answers_for_reuse_later#</label><br>
+<formwidget id="add_another_choice"><br>
+<if @choice_sets@ not nil><p>#assessment.OrUseChoices#<br>
 <formwidget id="add_existing_mc_id">
 </p></if>
 </case>
Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	7 Oct 2007 22:36:54 -0000	1.19
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	31 Jan 2008 16:06:26 -0000	1.20
@@ -11,7 +11,7 @@
 </tr>
 </table>
 
-<br />
+<br>
 
 <table class="table-display" cellpadding="2" cellspacing="0">
 
@@ -69,7 +69,7 @@
 </tr>
 
 <tr class="odd">
-  <td valign="top" rowspan="7"><nobr>#assessment.Response_Options# </nobr></td>
+  <td valign="top" rowspan="7"><div>#assessment.Response_Options# </div></td>
 </tr>
 
 <tr class="odd">
@@ -106,7 +106,7 @@
 	[ <a href="@edit_url@">#assessment.Edit#</a> ]</td>
 </tr>
 
-<tr class="even"><td valign="top">#assessment.Email_Options#</td><td >@notification_chunk;noquote@ <br /><a href="send-mail?assessment_id=@assessment_id@">#assessment.Send_bulkmail#</a> #assessment.regarding_this_assess# </td></tr>
+<tr class="even"><td valign="top">#assessment.Email_Options#</td><td >@notification_chunk;noquote@ <br><a href="send-mail?assessment_id=@assessment_id@">#assessment.Send_bulkmail#</a> #assessment.regarding_this_assess# </td></tr>
 	
 <tr class="odd">
 	<td>#assessment.Extreme_Actions# </td>
Index: openacs-4/packages/assessment/www/asm-admin/questions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/questions.adp	15 May 2007 20:14:18 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/questions.adp	31 Jan 2008 16:06:26 -0000	1.3
@@ -5,32 +5,32 @@
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="@tab@">
 
 <multiple name="sections">
-<a name="@sections.sort_order@"><h3>#assessment.Section_Number#</h3>
-  <a class="button" href="section-form?section_id=@sections.section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a> 
+<h3><a name="@sections.sort_order@">#assessment.Section_Number#</a></h3>
+  <a class="button" href="@section_form_edit_url@">#assessment.Edit#</a> 
 
-  <a class=button href="section-form?assessment_id=@assessment_id@&after=@sections.sort_order@">#assessment.add_new_section#</a>
-  <a class=button href="catalog-search?assessment_id=@assessment_id@&after=@sections.sort_order@">#assessment.Search_Section#</a>
-  <if @sections.display_type_id@ not nil><a class=button href="section-display-form?assessment_id=@assessment_id@&section_id=@sections.section_id@&display_type_id=@sections.display_type_id@">#assessment.edit_section_display#</a></if>
-  <a class=button href="section-preview?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.section_preview#</a>
+  <a class=button href="@section_form_add_url@">#assessment.add_new_section#</a>
+  <a class=button href="@catalog_section_url@">#assessment.Search_Section#</a>
+  <if @sections.display_type_id@ not nil><a class=button href="@section_display_form_url@">#assessment.edit_section_display#</a></if>
+  <a class=button href="@section_preview_url@">#assessment.section_preview#</a>
 
   <if @sections.sort_order@ lt @max_sort_order@>
-  <a  href="section-swap?assessment_id=@assessment_id@&sort_order=@sections.sort_order@&direction=down"><img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#"></a>
+  <a  href="@section_swap_down_url@"><img src="/resources/assessment/down.gif" style="border: 0;" alt="#assessment.Move_Down#"></a>
   </if>
   <if @sections.sort_order@ gt 1>
-  <a href="section-swap?assessment_id=@assessment_id@&sort_order=@sections.sort_order@&direction=up"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+  <a href="@section_swap_up_url@"><img src="/resources/assessment/up.gif" style="border: 0;" alt="#assessment.Move_Up#"></a>
   </if>
 
-  <a href="section-delete?section_id=@sections.section_id@&assessment_id=@assessment_id@"><img src="/resources/acs-subsite/Delete16.gif" border="0" alt="#assessment.remove_section#"></a>
+  <a href="@section_delete_url@"><img src="/resources/acs-subsite/Delete16.gif" style="border: 0;" alt="#assessment.remove_section#"></a>
   <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
   (@sections.points@ #assessment.points#)
 
 <if @admin_trigger_p@>
-  <a class=button href="checks-admin?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.admin_triggers#</a>
-  <a class=button href="add-edit-section-check?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.add_section_trigger#</a>
+  <a class=button href="@checks_admin_url@">#assessment.admin_triggers#</a>
+  <a class=button href="@add_edit_section_check_url@">#assessment.add_section_trigger#</a>
 </if>
 
 <p>  @sections.title@ </p>
-  <img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
+  <img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">
 <fieldset><legend>#assessment.Items#</legend>
   <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id@" section_id="@sections.section_id@" admin_trigger_p="@admin_trigger_p@">
 </fieldset>
Index: openacs-4/packages/assessment/www/asm-admin/questions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/questions.tcl	15 May 2007 20:14:18 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/questions.tcl	31 Jan 2008 16:06:26 -0000	1.3
@@ -23,10 +23,23 @@
 as::assessment::data -assessment_id $assessment_id
 set assessment_rev_id $assessment_data(assessment_rev_id)
 
-db_multirow -extend { section_url } sections sections_query {} {
+db_multirow -extend { section_url section_form_edit_url section_form_add_url catalog_section_url section_display_form_url section_preview_url section_delete_url checks_admin_url add_edit_section_check_url section_swap_down_url section_swap_up_url } sections sections_query {} {
     set section_url [export_vars -base one-section {assessment_id section_id}]
+
+    # Build URLs
+    set section_form_edit_url [export_vars -base section-form {section_id assessment_id}]
+    set section_form_add_url [export_vars -base section-form {assessment_id {after $sort_order}}]
+    set catalog_section_url [export_vars -base catalog-search {assessment_id {after $sort_order}}]
+    set section_display_form_url [export_vars -base section-display-form {assessment_id section_id display_type_id}]
+    set section_preview_url [export_vars -base section-preview {assessment_id section_id}]
+    set section_delete_url [export_vars -base section-delete {section_id assessment_id}]
+    set checks_admin_url [export_vars -base checks-admin {assessment_id section_id}]
+    set add_edit_section_check_url [export_vars -base add-edit-section-checks {assessment_id section_id}]
+    set section_swap_down_url [export_vars -base section-swap {assessment_id section_id {direction down}}]
+    set section_swap_up_url [export_vars -base section-swap {assessment_id section_id {direction up}}]
 }
 
+
 set max_sort_order [db_string max_sort_order {}]
 
 ad_return_template
Index: openacs-4/packages/assessment/www/asm-admin/results-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/results-users.tcl	7 Oct 2007 22:36:54 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/results-users.tcl	31 Jan 2008 16:06:26 -0000	1.12
@@ -94,11 +94,11 @@
         }
 	completed_datetime {
 	    label {[_ assessment.Finish_Time]}
-	    html {nowrap}
+	    html {style white-space:nowrap}
 	}
 	percent_score {
 	    label {[_ assessment.Percent_Score]}
-	    html {align right nowrap}
+	    html {align right style white-space:nowrap}
 	    display_template {<if @results.result_url@ not nil><a href="@results.result_url@">@results.percent_score@</a></if><else></else>}
 	}
     } -filters {
Index: openacs-4/packages/assessment/www/asm-admin/section-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-preview.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/section-preview.adp	12 Jun 2006 02:49:51 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/section-preview.adp	31 Jan 2008 16:06:26 -0000	1.5
@@ -4,14 +4,14 @@
 
 <table width="100%" cellpadding="3" cellspacing="0" border="0">
 <tr><th colspan="3">@assessment_data.title@</th></tr>
-<tr><td><i><font size="1">@assessment_data.instructions;noquote@</font></i></td></tr>
+<tr><td><i style="font-size: 1pt;">@assessment_data.instructions;noquote@</i></td></tr>
 <tr>
 <td colspan="3"><hr></td>
 </tr>
 </table>
 
 <table border="0">
-  <tr bgcolor="#d0d0d0"><td><b>@section.title@</b></td></tr>
+  <tr style="background-color: #d0d0d0;"><td><b>@section.title@</b></td></tr>
   <tr><td><i>@section.description@</i></td></tr>
   <tr><td>@section.instructions@</td></tr>
 </table>
Index: openacs-4/packages/assessment/www/asm-admin/sessions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/sessions.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/sessions.adp	7 Oct 2007 22:36:54 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/sessions.adp	31 Jan 2008 16:06:26 -0000	1.4
@@ -3,5 +3,5 @@
   <property name="context">@context@</property>
   <if @assessment_data.html_title@ defined><h2>#assessment.lt_Responses_for_assessm#</h2></if>
   <if @person_name@ defined><h2>#assessment.lt_Responses_of_user_per#</h2></if>
-  <p />
-  <listtemplate name="sessions"></listtemplate>
\ No newline at end of file
+
+  <listtemplate name="sessions"></listtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/sessions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/sessions.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/sessions.tcl	7 Oct 2007 22:36:54 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/sessions.tcl	31 Jan 2008 16:06:26 -0000	1.5
@@ -106,7 +106,7 @@
 	}
 	percent_score {
 	    label {[_ assessment.Percent_Score]}
-	    html {align right nowrap}
+	    html {align right}
 	    display_template {
 		<if @sessions.session_id@ not nil>
 		<a href="../session?session_id=@sessions.session_id@">