diff --git a/mozilla/webtools/partytool/views/feeds/index.thtml b/mozilla/webtools/partytool/views/feeds/index.thtml
index 48be0ddcde7..12b749d2ae6 100755
--- a/mozilla/webtools/partytool/views/feeds/index.thtml
+++ b/mozilla/webtools/partytool/views/feeds/index.thtml
@@ -8,7 +8,7 @@
     <item>
       <title><?php echo $count; ?></title>
       <description>Total Parties</description>
-      <link><?php echo APP_BASE.$html->url('/'); ?></link>
+      <link><?php echo APP_BASE.$html->url('/parties/view/all/'); ?></link>
     </item>
    </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/mozilla/webtools/partytool/views/users/edit.thtml b/mozilla/webtools/partytool/views/users/edit.thtml
index e3bf3dc32af..b193e847d22 100755
--- a/mozilla/webtools/partytool/views/users/edit.thtml
+++ b/mozilla/webtools/partytool/views/users/edit.thtml
@@ -12,7 +12,7 @@
     <?php echo $html->tagErrorMsg('User/name', 'You must enter a name.')?>
   </div>
   <div>
-    <label for="name" class="label-large">Website:</label>
+    <label for="UserWebsite" class="label-large">Website:</label>
     <?php echo $html->input('User/website', array('size' => 40)); ?>
   </div>
   <div>
@@ -80,8 +80,12 @@
   <div>
     <label for="UserShowemail" class="label-large">Show email:</label>
     <?php echo $html->checkbox('User/showemail'); ?><br/>
+  </div>
+  <div>
     <label for="UserShowloc" class="label-large">Show location:</label>
     <?php echo $html->checkbox('User/showloc'); ?><br/>
+  </div>
+  <div>
     <label for="UserShowmap" class="label-large">Show map:</label>
     <?php echo $html->checkbox('User/showmap'); ?><br/>
   </div>
diff --git a/mozilla/webtools/partytool/views/users/register.thtml b/mozilla/webtools/partytool/views/users/register.thtml
index ff4f992b1c7..661a2745014 100755
--- a/mozilla/webtools/partytool/views/users/register.thtml
+++ b/mozilla/webtools/partytool/views/users/register.thtml
@@ -22,7 +22,7 @@
     field is optional.
   <div>
     <label class="label-large" for="UserLocation">Location:</label>
-    <?php echo $html->input('User/location', array('id' => 'location', 'size' => 40, 'onkeypress' => 'capture(event)')); ?>
+    <?php echo $html->input('User/location', array('id' => 'location', 'size' => 40, 'onkeypress' => 'capture(event)', 'onblur' => 'update()')); ?>
     <div id="locerr" class="info" style="display: none">Did you mean: <a id="locerrlink" onclick="geocode_suggest()" href="#"></a>?  <a href="#" onclick="shide()"><span style="font-size: x-small">(close)</span></a></div>
   </div>
   <p>If you have a website, enter the URL here. (including the http:// ) Your website will be