diff --git a/static/css/note.css b/static/css/note.css
index d1c0a83..d089f4b 100644
--- a/static/css/note.css
+++ b/static/css/note.css
@@ -169,3 +169,17 @@ ol li {
   background-color: #fafafa;
   padding: 0.5em;
 }
+
+.thumbnail_left {
+  float: left;
+  border-width: 0;
+  padding-right: 2em;
+  padding-bottom: 1em;
+}
+
+.thumbnail_right {
+  float: right;
+  border-width: 0;
+  padding-left: 2em;
+  padding-bottom: 1em;
+}
diff --git a/static/html/faq.html b/static/html/faq.html
index 547be11..db851dd 100644
--- a/static/html/faq.html
+++ b/static/html/faq.html
@@ -16,9 +16,10 @@ whenever you want.</p>
 
 <b>Does this cost me anything?</b><br />
 
-<p>Nope, use of your personal Luminotes wiki is completely free. In the
-future, I may introduce a separate premium service with additional features.
-But the features you're using now will always remain free.</p>
+<p>Nope, use of your personal Luminotes wiki is completely free. Soon you will
+also be able to <a href="/notebooks/%s?note_id=new">upgrade</a> your Luminotes
+account to get notebook sharing features and additional storage space. But the
+features you're using now will always remain free.</p>
 
 <b>What does Luminotes run on?</b><br />
 
diff --git a/static/html/upgrade.html b/static/html/upgrade.html
index ca3676a..08c19f2 100644
--- a/static/html/upgrade.html
+++ b/static/html/upgrade.html
@@ -1,45 +1,53 @@
 <h3>upgrade</h3>
 
-<table border="1" cellspacing="0" cellpadding="10" id="upgrade_table">
-<tr>
-  <th>&nbsp;</th>
-  <th class="plan_name">Free</th>
-  <th class="plan_name">Basic<br /><span class="price_text">$5<span class="month_text">/month</span></span></th>
-  <th class="plan_name">Standard<br /><span class="price_text">$9<span class="month_text">/month</span></span></th>
-  <th class="plan_name">Premium<br /><span class="price_text">$19<span class="month_text">/month</span></span></th>
-<tr>
-  <td class="feature_name">included storage space</td>
-  <td>30 MB</td>
-  <td>250 MB</td>
-  <td>500 MB</td>
-  <td>2000 MB</td>
-</tr>
-<tr>
-  <td class="feature_name">unlimited wiki notebooks</td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-</tr>
-<tr>
-  <td class="feature_name">friendly email support</td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-</tr>
-<tr>
-  <td class="feature_name">multi-user collaboration</td>
-  <td>&nbsp;</td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-</tr>
-<tr>
-  <td class="feature_name">wiki access control</td>
-  <td>&nbsp;</td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-  <td><img src="../../static/images/check.png" width="20" height="17" /></td>
-</tr>
-</table>
+<p>
+In a few short weeks, you'll be able to upgrade your Luminotes account to get
+notebook sharing features and additional storage space. Here are some of the
+features you can look forward to.
+</p>
+
+<h3>share your notebook</h3>
+
+<p>
+<a href="/static/images/share.png" target="_new"><img
+src="/static/images/share_thumb.png" class="thumbnail_right" /></a>
+Most of the time, you want to keep your personal wiki all to yourself. But
+sometimes you simply need to share your work with friends and colleagues. When
+you upgrade your Luminotes account, you'll be able to invite specific people
+to collaborate on your wiki simply by entering their email addresses. You can
+even give them full editing capbilities, so several people can contribute to
+your wiki notebook.
+</p>
+
+<h3>access control</h3>
+
+<p>
+<a href="/static/images/access.png" target="_new"><img
+src="/static/images/access_thumb.png" class="thumbnail_left" /></a>
+With an upgraded Luminotes wiki, you'll decide exactly how much access to give
+people. Collaborators can make changes to your notebook, while viewers can
+only read your wiki. And owners have the same complete access to your notebook
+that you do. When you're done collaborating, a single click revokes a user's
+notebook access.
+</p>
+
+<p>
+Your wiki access control works on a per-notebook basis, so you can easily
+share one notebook with your friends while keeping your other notebooks
+completely private.
+</p>
+
+<h3>additional storage space</h3>
+
+<p>
+An upgraded Luminotes account gets you more than just notebook sharing
+features. You'll also be treated to way more room for your personal wiki. That
+means you'll have more space for your notes and ideas, and you won't have to
+worry about running out of room anytime soon.
+</p>
+
+<h3>stay tuned</h3>
+
+More information about upgrading your Luminotes account will be added as it
+becomes available. Please consider subscribing to the <a href="/blog"
+target="_top">Luminotes blog</a> for updates!
diff --git a/static/images/access.png b/static/images/access.png
new file mode 100644
index 0000000..1794916
Binary files /dev/null and b/static/images/access.png differ
diff --git a/static/images/access_thumb.png b/static/images/access_thumb.png
new file mode 100644
index 0000000..dc02ae6
Binary files /dev/null and b/static/images/access_thumb.png differ
diff --git a/static/images/access_thumb.xcf b/static/images/access_thumb.xcf
new file mode 100644
index 0000000..e417184
Binary files /dev/null and b/static/images/access_thumb.xcf differ
diff --git a/static/images/share.png b/static/images/share.png
new file mode 100644
index 0000000..f12618f
Binary files /dev/null and b/static/images/share.png differ
diff --git a/static/images/share_thumb.png b/static/images/share_thumb.png
new file mode 100644
index 0000000..0134f27
Binary files /dev/null and b/static/images/share_thumb.png differ
diff --git a/static/images/share_thumb.xcf b/static/images/share_thumb.xcf
new file mode 100644
index 0000000..bfaac77
Binary files /dev/null and b/static/images/share_thumb.xcf differ