diff --git a/NEWS b/NEWS
index 5069848..ee15879 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 1.4.18: ???
  * Fixed a bug where clicking the link for an updated note in an RSS feed did
    not properly redirect to that note after login.
+ * "Nothing but notes" mode now hides the toolbar as well.
 
 1.4.17: July 24, 2008:
  * Updated the product tour with an analogy to index cards.
diff --git a/static/html/faq.html b/static/html/faq.html
index 1e22cc5..05c01de 100644
--- a/static/html/faq.html
+++ b/static/html/faq.html
@@ -1,5 +1,13 @@
 <h3>faq</h3>
 
+<b>Do you offer a desktop version of Luminotes?</b><br />
+
+<p>Not currently. One of the benefits of making Luminotes web-based is that you can easily collaborate with friends and colleagues.</p>
+
+<b>I've got a question about upgrading my account!</b><br />
+
+<p>Check out the questions and answers on the <a href="/pricing" target="_top">pricing &amp; sign up page</a>.</p>
+
 <b>What does Luminotes run on?</b><br />
 
 <ul>
@@ -17,14 +25,6 @@
   <li><a href="http://tango.freedesktop.org/" target="_top">Tango Desktop Project</a></li>
 </ul>
 
-<b>Do you offer a desktop version of Luminotes?</b><br />
-
-<p>Not currently. One of the benefits of making Luminotes web-based is that you can easily collaborate with friends and colleagues.</p>
-
-<b>I've got a question about upgrading my account!</b><br />
-
-<p>Check out the questions and answers on the <a href="/pricing" target="_top">pricing &amp; sign up page</a>.</p>
-
 <b>I've got a question that isn't answered here!</b><br />
 
 <p>I'll be happy to answer it. Check out my <a
diff --git a/view/Main_page.py b/view/Main_page.py
index c8b9c39..331fba1 100644
--- a/view/Main_page.py
+++ b/view/Main_page.py
@@ -2,7 +2,7 @@ from urllib import urlencode
 from cgi import escape
 from Page import Page
 from Header import Header
-from Tags import Link, Input, Div, Span, H2, H4, A, Br, Strong, Script, Img
+from Tags import Link, Input, Div, Span, H2, H4, A, Br, Strong, Script, Img, P, Noscript
 from Note_tree_area import Note_tree_area
 from Link_area import Link_area
 from Toolbar import Toolbar
@@ -165,6 +165,14 @@ class Main_page( Page ):
         ),
         Link_area( notebooks, notebook, parent_id, notebook_path, updates_path, user ),
         Div(
+          notebook.read_write and Noscript(
+            P( Strong(
+              u"""
+              Luminotes requires JavaScript to be enabled in your web browser in order to edit
+              your wiki. Please <a href="/enable_javascript">enable JavaScript</a> before continuing.
+              """
+            ) ),
+          ) or None,
           Rounded_div(
             ( notebook.name == u"trash" ) and u"trash_notebook" or u"current_notebook",
             ( notebook.name == u"trash" or not notebook.read_write ) \