diff --git a/app/assets/stylesheets/specific/users.css.scss b/app/assets/stylesheets/specific/users.css.scss
index 176e0c72e..fa7af0fa9 100644
--- a/app/assets/stylesheets/specific/users.css.scss
+++ b/app/assets/stylesheets/specific/users.css.scss
@@ -41,43 +41,41 @@ div#c-users {
     max-width: 40em;
     font-size: 1.2em;
     
-    form {
-      input {
-        font-size: 20pt;
-      }
-    }
-    
     div#feature-comparison {
       overflow: hidden;
       margin-bottom: 1em;
       
-      div.column {
-        width: 11em;
-        float: left;
-        border: 1px solid #666;
-        @include border-radius(4px);
-        padding: 0.25em 0.5em;
-        margin: 0.5em;
+      table {
+        width: 100%;
         
-        h1 {
-          font-size: $h3_size;
+        colgroup#basic {
+          background-color: #ddd;
         }
         
-        li {
-          margin-left: 1.5em;
-          list-style-type: disc;
+        colgroup#gold  {
+          background-color: #ffe;
         }
         
-        &#basic-account {
-          background: rgb(240, 255, 240);
+        colgroup#platinum {
+          background-color: #eee;
         }
         
-        &#privileged-account {
-          background: rgb(255, 255, 240);
+        td, th {
+          text-align: center;
+          vertical-align: top;
+          padding: 0.5em 0;
         }
-
-        &#contributor-account {
-          background: rgb(240, 240, 240);
+        
+        tbody {
+          tr {
+            border-bottom: 2px solid black;
+          }
+        }
+        
+        p.cost-footnote {
+          font-size: 80%;
+          color: gray;
+          margin: 0;
         }
       }
     }
diff --git a/app/views/user_mailer/upgrade.html.erb b/app/views/user_mailer/upgrade.html.erb
index 24fa1b888..6c0513533 100644
--- a/app/views/user_mailer/upgrade.html.erb
+++ b/app/views/user_mailer/upgrade.html.erb
@@ -1 +1 @@
-<p>You can upgrade your account by sending $10 USD via Paypal to <%= mail_to Danbooru.config.upgrade_account_email %>. Be sure to include your username.</p>
+<p>You can upgrade your account by sending $20 USD via Paypal to <%= mail_to Danbooru.config.upgrade_account_email %>. Be sure to include your username.</p>
diff --git a/app/views/users/_upgrade_notice.html.erb b/app/views/users/_upgrade_notice.html.erb
index cabb96a41..2a3eb5a90 100644
--- a/app/views/users/_upgrade_notice.html.erb
+++ b/app/views/users/_upgrade_notice.html.erb
@@ -1,4 +1,4 @@
 <div class="ui-corner-all ui-state-highlight" id="upgrade-account-notice">
-  <h1><%= link_to "Upgrade your account for only $10!", upgrade_information_users_path %></h1>
+  <h1><%= link_to "Upgrade your account for only $20!", upgrade_information_users_path %></h1>
   <p><%= link_to "No thanks", "#", :id => "hide-upgrade-account-notice" %></p>
 </div>
diff --git a/app/views/users/upgrade_information.html.erb b/app/views/users/upgrade_information.html.erb
index 021d2154d..dec2cb140 100644
--- a/app/views/users/upgrade_information.html.erb
+++ b/app/views/users/upgrade_information.html.erb
@@ -1,39 +1,57 @@
 <div id="c-users">
   <div id="a-upgrade-information">
-    <h1>Upgrade Account</h1>
+    <h1>Upgrade Your Account</h1>
     
-    <p class="copy">Annoyed by ads? Want more searching power? Upgrade your account for only $10 and become a power user of the best database of anime artwork on the internet.</p>
+    <p class="copy">Annoyed by ads? Want more searching power? Upgrade your account and become a power user of the best database of anime artwork on the internet.</p>
     
     <div id="feature-comparison">
-      <div class="column" id="basic-account">
-        <h1>Basic</h1>
-        <ul>
-          <li>Free</li>
-          <li>Ad supported</li>
-          <li>Search 2 tags at a time</li>
-        </ul>
-      </div>
-      
-      <div class="column" id="privileged-account">
-        <h1>Privileged</h1>
-        <ul>
-          <li>One time $10 fee</li>
-          <li>No ads</li>
-          <li>Search 8 tags at a time</li>
-          <li>Subscribe to tags</li>
-          <li>Warm fuzzy feeling</li>
-        </ul>
-      </div>
-      
-      <div class="column" id="contributor-account">
-        <h1>Contributor</h1>
-        <ul>
-          <li>Invite only</li>
-          <li>Unlimited uploads</li>
-        </ul>
-      </div>
+      <table>
+        <thead>
+          <tr>
+            <th></th>
+            <th>Basic</th>
+            <th>Gold</th>
+            <th>Platinum</th>
+          </tr>
+        </thead>
+        <tbody>
+          <colgroup></colgroup>
+          <colgroup id="basic"></colgroup>
+          <colgroup id="gold"></colgroup>
+          <colgroup id="platinum"></colgroup>
+          <tr>
+            <td>Cost</td>
+            <td>Free</td>
+            <td>$20<p class="cost-footnote">One time fee</p></td>
+            <td>$40<p class="cost-footnote">One time fee</p></td>
+          </tr>
+          <tr>
+            <td>Ads</td>
+            <td>Yes</td>
+            <td>None</td>
+            <td>None</td>
+          </tr>
+          <tr>
+            <td>Tag Limit</td>
+            <td>2</td>
+            <td>6</td>
+            <td>12</td>
+          </tr>
+          <tr>
+            <td>Favorite Limit</td>
+            <td>1,000</td>
+            <td>5,000</td>
+            <td>Unlimited</td>
+          </tr>
+          <tr>
+            <td>Bookmark Tags</td>
+            <td>No</td>
+            <td>Yes</td>
+            <td>Yes</td>
+          </tr>
+        </tbody>
+      </table>
     </div>
-    
     <p>Just provide your email address and details for upgrading your account will be sent to you. If you have any further questions or concerns, feel free to contact me at <%= mail_to Danbooru.config.contact_email, nil, :encode => :javascript %>.</p>
 
     <%= form_tag(upgrade_user_path(CurrentUser.user)) do %>