1 files changed, 12 insertions, 11 deletions
diff --git a/site/app/views/users/pwreset.thtml b/site/app/views/users/pwreset.thtml
index b9962c0..ea1e916 100644
--- a/site/app/views/users/pwreset.thtml
+++ b/site/app/views/users/pwreset.thtml
@@ -37,23 +37,23 @@
  *
  * ***** END LICENSE BLOCK ***** */ 
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
 <?php if(!isset($email)): ?>
 
 <form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserEmail"><?=_('user_form_email')?></label>
         <?=$html->input('User/email') ?>
         <?=$html->tagErrorMsg('User/email', _('error_user_notfound'))?>
     </div>
-    <div class="container">
+    <div>
         <?=$html->submit(_('user_pwreset_submit_sendlink'), array('class'=>'amo-submit')); ?>
     </div>
 </form>
@@ -68,20 +68,21 @@ else:
 <form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
 
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserPassword"><?=_('user_form_newpassword')?></label>
         <?=$html->password('User/password') ?>
         <?=$html->tagErrorMsg('User/password', _('error_field_required'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserConfirmpw"><?=_('user_form_confirmpassword')?></label>
         <?=$html->password('User/confirmpw') ?>
         <?=$html->tagErrorMsg('User/confirmpw', _('error_user_confirmpw_nomatch'))?>
     </div>
-    <div class="container">
+    <div>
         <?=$html->submit(_('user_pwreset_submit_changepw'), array('class'=>'amo-submit'));?>
     </div>
 </form>
 <?php endif; ?>
 
+    </div>
 </div>