Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	24 Sep 2005 07:58:54 -0000	1.20.2.1
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	24 Sep 2005 08:07:03 -0000	1.20.2.2
@@ -6,58 +6,9 @@
 
 
 <table> <tr valign="top"> 
-<td>
+<td width="35%">
 <div class="portlet-wrapper">
 	<div class="portlet-title">
-	<span>My Account</span>
-	</div>
-        <div class="portlet">
-  	<include src="/packages/acs-subsite/lib/user-info" />
-  	<if @account_status@ eq "closed">
-    	#acs-subsite.Account_closed_workspace_msg#
-  	</if>
-</div>
-</div>
-
-
-  <if @portrait_state@ eq upload>
-
-<div class="portlet-wrapper">
-        <div class="portlet-title">
-	     <span>#acs-subsite.Your_Portrait#</span>
-	</div>
-        <div class="portlet">
-	    <p>
-	    #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
-	    </p>
-	</div>
-</div>
-</if>
-
-  <if @portrait_state@ eq show>
-<div class="portlet-wrapper">  
-  <div class="portlet-title">
-             <span>#acs-subsite.Your_Portrait#</span>
-  </div>
-  <div class="portlet">
-    <p>
-      #acs-subsite.lt_On_portrait_publish_d#.
-    </p>
-<table><tr valign="top"><td>
-<img width=64 height=86 src="/shared/portrait-bits.tcl?user_id=@user_id@"
-alt="Portrait"><p>
-<a href="/user/portrait/?return_url=/pvt/home">Edit</a>
-</td><td>@portrait_description@</td></tr>
-</table>
-</div>
-</div>
-  </if>
-
-</td>
-<td>
-
-<div class="portlet-wrapper">
-	<div class="portlet-title">
 	<span>Edit Options</span>
 	</div>
 	<div class="portlet">
@@ -108,8 +59,57 @@
 </div>
 </div>
 
+</td>
+<td>
+
 <div class="portlet-wrapper">
+	<div class="portlet-title">
+	<span>My Account</span>
+	</div>
+        <div class="portlet">
+  	<include src="/packages/acs-subsite/lib/user-info" />
+  	<if @account_status@ eq "closed">
+    	#acs-subsite.Account_closed_workspace_msg#
+  	</if>
+</div>
+</div>
+
+
+  <if @portrait_state@ eq upload>
+
+<div class="portlet-wrapper">
         <div class="portlet-title">
+	     <span>#acs-subsite.Your_Portrait#</span>
+	</div>
+        <div class="portlet">
+	    <p>
+	    #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
+	    </p>
+	</div>
+</div>
+</if>
+
+  <if @portrait_state@ eq show>
+<div class="portlet-wrapper">  
+  <div class="portlet-title">
+             <span>#acs-subsite.Your_Portrait#</span>
+  </div>
+  <div class="portlet">
+    <p>
+      #acs-subsite.lt_On_portrait_publish_d#.
+    </p>
+<table><tr valign="top"><td>
+<img width=64 height=86 src="/shared/portrait-bits.tcl?user_id=@user_id@"
+alt="Portrait"><p>
+<a href="/user/portrait/?return_url=/pvt/home">Edit</a>
+</td><td>@portrait_description@</td></tr>
+</table>
+</div>
+</div>
+  </if>
+
+<div class="portlet-wrapper">
+        <div class="portlet-title">
   	<span><list name="fragments"></span>
 	</div>
 	<div class="portlet">