diff --git a/extensions/wallet/cookieviewer/CookieViewer.xul b/extensions/wallet/cookieviewer/CookieViewer.xul
index 01debbb67fbb..19ace7f53331 100644
--- a/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/extensions/wallet/cookieviewer/CookieViewer.xul
@@ -67,11 +67,11 @@
               <treerow>
                 <treecell class="treecell-header sortDirectionIndicator"
                           label="&treehead.cookiedomain.label;"
-                          onclick="return Wallet_ColumnSort('0', 'cookieList');"/>
+                          onclick="return CookieColumnSort('0', 'cookieList');"/>
                 <treecell class="treecell-header
                           sortDirectionIndicator"
                           label="&treehead.cookiename.label;"
-                          onclick="return Wallet_ColumnSort('1', 'cookieList');"/>
+                          onclick="return CookieColumnSort('1', 'cookieList');"/>
               </treerow>          
             </treehead>
             <treechildren id="cookieList" flex="1"/>
@@ -85,27 +85,27 @@
                 <column flex="1"/>
               </columns>
               <rows>
-                <row>
+                <row align="center">
                   <text value="&props.name.label;"/>
                   <textbox id="ifl_name" readonly="true"/>
                 </row>
-                <row>
+                <row align="center">
                   <text value="&props.value.label;"/>
                   <textbox id="ifl_value" readonly="true"/>
                 </row>
-                <row>
+                <row align="center">
                   <text id="ifl_isDomain" value="&props.domain.label;"/>
                   <textbox id="ifl_host" readonly="true"/>
                 </row>
-                <row>
+                <row align="center">
                   <text value="&props.path.label;"/>
                   <textbox id="ifl_path" readonly="true"/>
                 </row>
-                <row>
+                <row align="center">
                   <text value="&props.secure.label;"/>
                   <textbox id="ifl_isSecure" readonly="true"/>
                 </row>
-                <row>
+                <row align="center">
                   <text value="&props.expires.label;"/>
                   <textbox id="ifl_expires" readonly="true"/>
                 </row>
diff --git a/extensions/wallet/editor/WalletAddress.xul b/extensions/wallet/editor/WalletAddress.xul
index 6b461f562f46..7ec59ab69415 100644
--- a/extensions/wallet/editor/WalletAddress.xul
+++ b/extensions/wallet/editor/WalletAddress.xul
@@ -58,7 +58,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&addressLine1.label;</html>
           <menulist id="street.line1" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -68,7 +68,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressLine2.label;</html>
           <menulist id="street.line2" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -78,7 +78,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressLine3.label;</html>
           <menulist id="street.line3" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -88,7 +88,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressCity.label;</html>
           <menulist id="city" editable="true" autoSelectMenuitem="false"
                      onchange="Append(this)">
@@ -98,7 +98,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressState.label;</html>
           <menulist id="state" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -108,7 +108,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressZipcode.label;</html>
           <hbox>
           <menulist id="postalcode.prefix" editable="true" autoSelectMenuitem="false" flex="55%" width="0"
@@ -127,7 +127,7 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressCountry.label;</html>
           <menulist id="country" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -137,7 +137,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&email.label;</html>
           <menulist id="email" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -147,7 +147,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&homepage.label;</html>
           <menulist id="uri" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/WalletConcatenated.xul b/extensions/wallet/editor/WalletConcatenated.xul
index 475cbcd0efa7..330c09eb3438 100644
--- a/extensions/wallet/editor/WalletConcatenated.xul
+++ b/extensions/wallet/editor/WalletConcatenated.xul
@@ -72,7 +72,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatName.label;</html>
           <menulist id="name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -82,7 +82,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatZipcode.label;</html>
           <menulist id="home.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -92,7 +92,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPhone.label;</html>
           <menulist id="home.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -102,7 +102,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPhonenumber.label;</html>
           <menulist id="home.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -112,7 +112,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatAltPhone.label;</html>
           <menulist id="home.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -122,7 +122,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatAltPhonenumber.label;</html>
           <menulist id="home.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -132,7 +132,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatFax.label;</html>
           <menulist id="home.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -142,7 +142,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatFaxnumber.label;</html>
           <menulist id="home.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -152,7 +152,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatMobile.label;</html>
           <menulist id="home.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -162,7 +162,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatMobilenumber.label;</html>
           <menulist id="home.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -172,7 +172,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPager.label;</html>
           <menulist id="home.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -182,7 +182,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPagernumber.label;</html>
           <menulist id="home.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -205,7 +205,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoName.label;</html>
           <menulist id="shipto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -215,7 +215,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoZipcode.label;</html>
           <menulist id="shipto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -225,7 +225,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPhone.label;</html>
           <menulist id="shipto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -235,7 +235,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPhonenumber.label;</html>
           <menulist id="shipto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -245,7 +245,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoAltPhone.label;</html>
           <menulist id="shipto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -255,7 +255,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoAltPhonenumber.label;</html>
           <menulist id="shipto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -265,7 +265,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoFax.label;</html>
           <menulist id="shipto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -275,7 +275,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoFaxnumber.label;</html>
           <menulist id="shipto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -285,7 +285,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoMobile.label;</html>
           <menulist id="shipto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -295,7 +295,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoMobilenumber.label;</html>
           <menulist id="shipto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -305,7 +305,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPager.label;</html>
           <menulist id="shipto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -315,7 +315,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPagernumber.label;</html>
           <menulist id="shipto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -338,7 +338,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoName.label;</html>
           <menulist id="billto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -348,7 +348,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoZipcode.label;</html>
           <menulist id="billto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -358,7 +358,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPhone.label;</html>
           <menulist id="billto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -368,7 +368,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPhonenumber.label;</html>
           <menulist id="billto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -378,7 +378,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoAltPhone.label;</html>
           <menulist id="billto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -388,7 +388,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoAltPhonenumber.label;</html>
           <menulist id="billto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -398,7 +398,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoFax.label;</html>
           <menulist id="billto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -408,7 +408,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoFaxnumber.label;</html>
           <menulist id="billto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -418,7 +418,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoMobile.label;</html>
           <menulist id="billto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -428,7 +428,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoMobilenumber.label;</html>
           <menulist id="billto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -438,7 +438,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPager.label;</html>
           <menulist id="billto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -448,7 +448,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPagernumber.label;</html>
           <menulist id="billto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -471,7 +471,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatCardExpdate.label;</html>
           <menulist id="card.expdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -481,7 +481,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatSocSec.label;</html>
           <menulist id="socsec" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -491,7 +491,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBdate.label;</html>
           <menulist id="bdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -501,7 +501,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatAnniv.label;</html>
           <menulist id="anniv" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/WalletCredit.xul b/extensions/wallet/editor/WalletCredit.xul
index ebfcfe7ff1e0..3fa2b5ebe947 100644
--- a/extensions/wallet/editor/WalletCredit.xul
+++ b/extensions/wallet/editor/WalletCredit.xul
@@ -57,7 +57,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&creditType.label;</html>
           <menulist id="card.type" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -67,7 +67,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&creditNumber.label;</html>
           <menulist id="card.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -77,9 +77,9 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&creditExpires.label;</html>
-          <hbox>
+          <hbox align="center">
             <text value="&creditExpiresMonth.label;" />
             <menulist id="card.expdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -97,7 +97,7 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&creditName.label;</html>
           <menulist id="card.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/WalletEmploy.xul b/extensions/wallet/editor/WalletEmploy.xul
index 7a1bb730914e..68b6211b136c 100644
--- a/extensions/wallet/editor/WalletEmploy.xul
+++ b/extensions/wallet/editor/WalletEmploy.xul
@@ -56,7 +56,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&employName.label;</html>
           <menulist id="business.companyname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -66,7 +66,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&employTitle.label;</html>
           <menulist id="business.jobtitle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -76,7 +76,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&employDepartment.label;</html>
           <menulist id="business.department" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/WalletMisc.xul b/extensions/wallet/editor/WalletMisc.xul
index 81b0b01431e2..85377a6a3c2f 100644
--- a/extensions/wallet/editor/WalletMisc.xul
+++ b/extensions/wallet/editor/WalletMisc.xul
@@ -59,7 +59,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&miscSS.label;</html>
           <hbox>
             <menulist id="socsec.prefix" editable="true" autoSelectMenuitem="false" flex="33%" width="0"
@@ -85,9 +85,9 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscLicense.label;</html>
-          <hbox>
+          <hbox align="center">
             <menulist id="license.number" editable="true" autoSelectMenuitem="false" flex="70" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -105,7 +105,7 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscMaiden.label;</html>
           <menulist id="mothersmaidenname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -115,9 +115,9 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscBirthday.label;</html>
-          <hbox>
+          <hbox align="center">
             <text value="&miscBirthdayMonth.label;" />
             <menulist id="bdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -142,9 +142,9 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscAnniv.label;</html>
-          <hbox>
+          <hbox align="center">
             <text value="&miscAnnivMonth.label;" />
             <menulist id="anniv.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
diff --git a/extensions/wallet/editor/WalletName.xul b/extensions/wallet/editor/WalletName.xul
index bcb755ceacd2..3100001ca7cd 100644
--- a/extensions/wallet/editor/WalletName.xul
+++ b/extensions/wallet/editor/WalletName.xul
@@ -57,7 +57,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&namePrefix.label;</html>
           <menulist id="name.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -67,7 +67,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameFirst.label;</html>
           <menulist id="name.first" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -77,7 +77,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameMiddle.label;</html>
           <menulist id="name.middle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -87,7 +87,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameLast.label;</html>
           <menulist id="name.last" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -97,7 +97,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameSuffix.label;</html>
           <menulist id="name.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/WalletPhone.xul b/extensions/wallet/editor/WalletPhone.xul
index 638202b1d993..93615c40b521 100644
--- a/extensions/wallet/editor/WalletPhone.xul
+++ b/extensions/wallet/editor/WalletPhone.xul
@@ -67,7 +67,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&phoneDay.label;</html>
           <text value="("/>
           <menulist id="phone.loccode" editable="true" autoSelectMenuitem="false"
@@ -99,7 +99,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phoneEve.label;</html>
           <text value="("/>
           <menulist id="altphone.loccode" editable="true" autoSelectMenuitem="false"
@@ -131,7 +131,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phoneFax.label;</html>
           <text value="("/>
           <menulist id="fax.loccode" editable="true" autoSelectMenuitem="false"
@@ -156,7 +156,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phoneCell.label;</html>
           <text value="("/>
           <menulist id="mobile.loccode" editable="true" autoSelectMenuitem="false"
@@ -181,7 +181,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phonePager.label;</html>
           <text value="("/>
           <menulist id="pager.loccode" editable="true" autoSelectMenuitem="false"
diff --git a/extensions/wallet/editor/resources/content/WalletAddress.xul b/extensions/wallet/editor/resources/content/WalletAddress.xul
index 6b461f562f46..7ec59ab69415 100644
--- a/extensions/wallet/editor/resources/content/WalletAddress.xul
+++ b/extensions/wallet/editor/resources/content/WalletAddress.xul
@@ -58,7 +58,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&addressLine1.label;</html>
           <menulist id="street.line1" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -68,7 +68,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressLine2.label;</html>
           <menulist id="street.line2" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -78,7 +78,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressLine3.label;</html>
           <menulist id="street.line3" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -88,7 +88,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressCity.label;</html>
           <menulist id="city" editable="true" autoSelectMenuitem="false"
                      onchange="Append(this)">
@@ -98,7 +98,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressState.label;</html>
           <menulist id="state" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -108,7 +108,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressZipcode.label;</html>
           <hbox>
           <menulist id="postalcode.prefix" editable="true" autoSelectMenuitem="false" flex="55%" width="0"
@@ -127,7 +127,7 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&addressCountry.label;</html>
           <menulist id="country" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -137,7 +137,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&email.label;</html>
           <menulist id="email" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -147,7 +147,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&homepage.label;</html>
           <menulist id="uri" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/resources/content/WalletConcatenated.xul b/extensions/wallet/editor/resources/content/WalletConcatenated.xul
index 475cbcd0efa7..330c09eb3438 100644
--- a/extensions/wallet/editor/resources/content/WalletConcatenated.xul
+++ b/extensions/wallet/editor/resources/content/WalletConcatenated.xul
@@ -72,7 +72,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatName.label;</html>
           <menulist id="name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -82,7 +82,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatZipcode.label;</html>
           <menulist id="home.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -92,7 +92,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPhone.label;</html>
           <menulist id="home.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -102,7 +102,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPhonenumber.label;</html>
           <menulist id="home.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -112,7 +112,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatAltPhone.label;</html>
           <menulist id="home.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -122,7 +122,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatAltPhonenumber.label;</html>
           <menulist id="home.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -132,7 +132,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatFax.label;</html>
           <menulist id="home.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -142,7 +142,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatFaxnumber.label;</html>
           <menulist id="home.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -152,7 +152,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatMobile.label;</html>
           <menulist id="home.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -162,7 +162,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatMobilenumber.label;</html>
           <menulist id="home.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -172,7 +172,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPager.label;</html>
           <menulist id="home.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -182,7 +182,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatPagernumber.label;</html>
           <menulist id="home.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -205,7 +205,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoName.label;</html>
           <menulist id="shipto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -215,7 +215,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoZipcode.label;</html>
           <menulist id="shipto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -225,7 +225,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPhone.label;</html>
           <menulist id="shipto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -235,7 +235,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPhonenumber.label;</html>
           <menulist id="shipto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -245,7 +245,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoAltPhone.label;</html>
           <menulist id="shipto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -255,7 +255,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoAltPhonenumber.label;</html>
           <menulist id="shipto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -265,7 +265,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoFax.label;</html>
           <menulist id="shipto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -275,7 +275,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoFaxnumber.label;</html>
           <menulist id="shipto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -285,7 +285,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoMobile.label;</html>
           <menulist id="shipto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -295,7 +295,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoMobilenumber.label;</html>
           <menulist id="shipto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -305,7 +305,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPager.label;</html>
           <menulist id="shipto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -315,7 +315,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatShiptoPagernumber.label;</html>
           <menulist id="shipto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -338,7 +338,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoName.label;</html>
           <menulist id="billto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -348,7 +348,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoZipcode.label;</html>
           <menulist id="billto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -358,7 +358,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPhone.label;</html>
           <menulist id="billto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -368,7 +368,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPhonenumber.label;</html>
           <menulist id="billto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -378,7 +378,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoAltPhone.label;</html>
           <menulist id="billto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -388,7 +388,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoAltPhonenumber.label;</html>
           <menulist id="billto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -398,7 +398,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoFax.label;</html>
           <menulist id="billto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -408,7 +408,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoFaxnumber.label;</html>
           <menulist id="billto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -418,7 +418,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoMobile.label;</html>
           <menulist id="billto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -428,7 +428,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoMobilenumber.label;</html>
           <menulist id="billto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -438,7 +438,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPager.label;</html>
           <menulist id="billto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -448,7 +448,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBilltoPagernumber.label;</html>
           <menulist id="billto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -471,7 +471,7 @@
       </columns>
       <rows>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatCardExpdate.label;</html>
           <menulist id="card.expdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -481,7 +481,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatSocSec.label;</html>
           <menulist id="socsec" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -491,7 +491,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatBdate.label;</html>
           <menulist id="bdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -501,7 +501,7 @@
           </menulist>
         </row>
 
-        <row hidden="true">
+        <row hidden="true" align="center">
           <html>&concatAnniv.label;</html>
           <menulist id="anniv" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/resources/content/WalletCredit.xul b/extensions/wallet/editor/resources/content/WalletCredit.xul
index ebfcfe7ff1e0..3fa2b5ebe947 100644
--- a/extensions/wallet/editor/resources/content/WalletCredit.xul
+++ b/extensions/wallet/editor/resources/content/WalletCredit.xul
@@ -57,7 +57,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&creditType.label;</html>
           <menulist id="card.type" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -67,7 +67,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&creditNumber.label;</html>
           <menulist id="card.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -77,9 +77,9 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&creditExpires.label;</html>
-          <hbox>
+          <hbox align="center">
             <text value="&creditExpiresMonth.label;" />
             <menulist id="card.expdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -97,7 +97,7 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&creditName.label;</html>
           <menulist id="card.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/resources/content/WalletEmploy.xul b/extensions/wallet/editor/resources/content/WalletEmploy.xul
index 7a1bb730914e..68b6211b136c 100644
--- a/extensions/wallet/editor/resources/content/WalletEmploy.xul
+++ b/extensions/wallet/editor/resources/content/WalletEmploy.xul
@@ -56,7 +56,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&employName.label;</html>
           <menulist id="business.companyname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -66,7 +66,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&employTitle.label;</html>
           <menulist id="business.jobtitle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -76,7 +76,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&employDepartment.label;</html>
           <menulist id="business.department" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/resources/content/WalletMisc.xul b/extensions/wallet/editor/resources/content/WalletMisc.xul
index 81b0b01431e2..85377a6a3c2f 100644
--- a/extensions/wallet/editor/resources/content/WalletMisc.xul
+++ b/extensions/wallet/editor/resources/content/WalletMisc.xul
@@ -59,7 +59,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&miscSS.label;</html>
           <hbox>
             <menulist id="socsec.prefix" editable="true" autoSelectMenuitem="false" flex="33%" width="0"
@@ -85,9 +85,9 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscLicense.label;</html>
-          <hbox>
+          <hbox align="center">
             <menulist id="license.number" editable="true" autoSelectMenuitem="false" flex="70" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -105,7 +105,7 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscMaiden.label;</html>
           <menulist id="mothersmaidenname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -115,9 +115,9 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscBirthday.label;</html>
-          <hbox>
+          <hbox align="center">
             <text value="&miscBirthdayMonth.label;" />
             <menulist id="bdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -142,9 +142,9 @@
           </hbox>
         </row>
 
-        <row>
+        <row align="center">
           <html>&miscAnniv.label;</html>
-          <hbox>
+          <hbox align="center">
             <text value="&miscAnnivMonth.label;" />
             <menulist id="anniv.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
diff --git a/extensions/wallet/editor/resources/content/WalletName.xul b/extensions/wallet/editor/resources/content/WalletName.xul
index bcb755ceacd2..3100001ca7cd 100644
--- a/extensions/wallet/editor/resources/content/WalletName.xul
+++ b/extensions/wallet/editor/resources/content/WalletName.xul
@@ -57,7 +57,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&namePrefix.label;</html>
           <menulist id="name.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -67,7 +67,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameFirst.label;</html>
           <menulist id="name.first" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -77,7 +77,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameMiddle.label;</html>
           <menulist id="name.middle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -87,7 +87,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameLast.label;</html>
           <menulist id="name.last" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
@@ -97,7 +97,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&nameSuffix.label;</html>
           <menulist id="name.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
diff --git a/extensions/wallet/editor/resources/content/WalletPhone.xul b/extensions/wallet/editor/resources/content/WalletPhone.xul
index 638202b1d993..93615c40b521 100644
--- a/extensions/wallet/editor/resources/content/WalletPhone.xul
+++ b/extensions/wallet/editor/resources/content/WalletPhone.xul
@@ -67,7 +67,7 @@
 
       <rows>
 
-        <row>
+        <row align="center">
           <html>&phoneDay.label;</html>
           <text value="("/>
           <menulist id="phone.loccode" editable="true" autoSelectMenuitem="false"
@@ -99,7 +99,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phoneEve.label;</html>
           <text value="("/>
           <menulist id="altphone.loccode" editable="true" autoSelectMenuitem="false"
@@ -131,7 +131,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phoneFax.label;</html>
           <text value="("/>
           <menulist id="fax.loccode" editable="true" autoSelectMenuitem="false"
@@ -156,7 +156,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phoneCell.label;</html>
           <text value="("/>
           <menulist id="mobile.loccode" editable="true" autoSelectMenuitem="false"
@@ -181,7 +181,7 @@
           </menulist>
         </row>
 
-        <row>
+        <row align="center">
           <html>&phonePager.label;</html>
           <text value="("/>
           <menulist id="pager.loccode" editable="true" autoSelectMenuitem="false"
