Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/packages/file-storage/www/file.adp	15 Dec 2006 22:45:33 -0000	1.22
+++ openacs-4/packages/file-storage/www/file.adp	18 Feb 2007 23:58:46 -0000	1.22.2.1
@@ -4,14 +4,18 @@
 <property name="context">@context;noquote@</property>
 <property name="displayed_object_id">@file_id;noquote@</property>
 
-<p><a href="@folder_view_url@" title="#file-storage.back_to_folder_view#">#file-storage.back_to_folder_view#</a></p>
-<p><if @show_all_versions_p@ true>
-    <a href="file?file_id=@file_id@&show_all_versions_p=f" class="button" title="#file-storage.lt_show_only_live_versio#">#file-storage.lt_show_only_live_versio#</a>
-  </if>
-  <else>
-    <a href="file?file_id=@file_id@&show_all_versions_p=t" class="button" title="#file-storage.show_all_versions#">#file-storage.show_all_versions#</a>
-  </else>
-</p>
+<h1>@title;noquote@ - #file-storage.properties#</h1>
+
+<div class="list-button-bar-top"><a href="@folder_view_url@" title="#file-storage.back_to_folder_view#">#file-storage.back_to_folder_view#</a></div>
+<div class="list-button-bar-top">
+	<if @show_all_versions_p@ true>
+		<a href="file?file_id=@file_id@&show_all_versions_p=f" class="button" title="#file-storage.lt_show_only_live_versio#">#file-storage.lt_show_only_live_versio#</a>
+	</if>
+	<else>
+		<a href="file?file_id=@file_id@&show_all_versions_p=t" class="button" title="#file-storage.show_all_versions#">#file-storage.show_all_versions#</a>
+	</else>
+</div>
+
   <listtemplate name="version"></listtemplate>
 <if @gc_comments@ not nil>
  <p>#file-storage.lt_Comments_on_this_file#
Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.32 -r1.32.2.1
--- openacs-4/packages/file-storage/www/index.adp	8 Aug 2006 21:26:49 -0000	1.32
+++ openacs-4/packages/file-storage/www/index.adp	18 Feb 2007 23:58:46 -0000	1.32.2.1
@@ -4,20 +4,19 @@
 <property name="context">@context;noquote@</property>
 <property name="displayed_object_id">@folder_id;noquote@</property>
 
-<table>
-<tr>
-<td>
-<if @up_url@ not nil>
-    <a href="@up_url@" class="button">#file-storage.index_page_navigate_up_folder#</a>
+<if @up_url@ not nil or  @project_url@ not nil>
+	<div class="list-button-bar-top">
+
+		<if @up_url@ not nil>
+			<a href="@up_url@" class="button">#file-storage.index_page_navigate_up_folder#</a>
+		</if>
+
+		<if @project_url@ not nil>
+			<a href="@project_url@">#file-storage.back_to_project#: @project_name@</a>
+		</if>
+
+	</div>
 </if>
-</td>
-<td>
-<if @project_url@ not nil>
-	<a href="@project_url@">#file-storage.back_to_project#: @project_name@</a>
-</if>
-</td>
-</tr>
-</table>
 <include src="folder-chunk" folder_id="@folder_id@"
     n_past_days="@n_past_days@" allow_bulk_actions="1" return_url="@return_url@">