Index: openacs-4/packages/edit-this-page/www/etp-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-master.adp,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/edit-this-page/www/etp-master.adp	11 Aug 2003 21:06:57 -0000	1.6
+++ openacs-4/packages/edit-this-page/www/etp-master.adp	20 Nov 2003 14:42:12 -0000	1.6.2.1
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
+<property name="title">@title;noquote@</property>
 <if @context_bar@ not nil>
 <property name="context_bar">@context_bar@</property>
 </if>
Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/www/default-master.adp	17 Oct 2003 09:48:51 -0000	1.19
+++ openacs-4/www/default-master.adp	20 Nov 2003 14:41:13 -0000	1.19.2.1
@@ -7,12 +7,14 @@
 <div id="body">
   <div id="navbar-body">
     <div class="subsite-context-bar">
-      @context_bar;noquote@&nbsp;
+      <div style="float: left">@context_bar;noquote@</div>
+      <div style="float: right">@subnavbar_link;noquote@</div>
+      <div style="clear: both;"></div>
     </div>
     <div id="subnavbar-body">
       <div id="subsite-name">
         <if @title@ not nil>
-          <h1 class="subsite-page-title">@title@</h1>
+          <h1 class="subsite-page-title">@title;noquote@</h1>
         </if>
       </div>
       <slave>