diff --git a/book_toc.html b/book_toc.html
index 01b280421d..a09f3d58e1 100644
--- a/book_toc.html
+++ b/book_toc.html
@@ -1,58 +1,62 @@
-<li><a href="javascript:goto_page(1)"> The Circuit Abstraction </a>
-<ul> <li><a href="javascript:goto_page(2)"> The Power of Abstraction </a>
-<li><a href="javascript:goto_page(3)"> The Lumped Circuit Abstraction</a>
-<li><a href="javascript:goto_page(4)"> The Lumped Matter Discipline </a>
-<li><a href="javascript:goto_page(5)"> Limitations of the Lumped Circuit Abstraction </a>
-<li><a href="javascript:goto_page(6)"> Practical Two-Terminal Elements </a>
-<ul> <li><a href="javascript:goto_page(7)"> Batteries </a>
-<li><a href="javascript:goto_page(8)"> Linear Resistors </a>
-<li><a href="javascript:goto_page(9)"> Associated Variables Convention </a>
-</ul> <li><a href="javascript:goto_page(10)"> Ideal Two-Terminal Elements </a>
-<ul> <li><a href="javascript:goto_page(11)"> Ideal Voltage Sources, Wires and Resistors </a>
-<li><a href="javascript:goto_page(12)"> Element Laws </a>
-<li><a href="javascript:goto_page(13)"> The Current Source</a>
-</ul> <li><a href="javascript:goto_page(14)"> Modeling Physical Elements </a>
-<li><a href="javascript:goto_page(15)"> Signal Representation </a>
-<ul> <li><a href="javascript:goto_page(16)"> Analog Signals</a>
-<li><a href="javascript:goto_page(17)"> Digital Signals</a>
-</ul> <li><a href="javascript:goto_page(18)"> Summary </a>
-</ul> <li><a href="javascript:goto_page(19)"> Resistive Networks </a>
-<ul> <li><a href="javascript:goto_page(20)"> Terminology </a>
-<li><a href="javascript:goto_page(21)"> Kirchhoff's Laws </a>
-<ul> <li><a href="javascript:goto_page(22)"> KCL </a>
-<li><a href="javascript:goto_page(23)"> KVL </a>
-</ul> <li><a href="javascript:goto_page(24)"> Circuit Analysis: Basic Method </a>
-<ul> <li><a href="javascript:goto_page(25)"> Single-Resistor Circuits </a>
-<li><a href="javascript:goto_page(26)"> Quick Intuitive Analysis of Single-Resistor Circuits </a>
-<li><a href="javascript:goto_page(27)"> Energy Conservation </a>
-<li><a href="javascript:goto_page(28)"> Voltage and Current Dividers </a>
-<li><a href="javascript:goto_page(29)"> Voltage Dividers </a>
-<li><a href="javascript:goto_page(30)"> Resistors in Series </a>
-<li><a href="javascript:goto_page(31)"> Current Dividers </a>
-<li><a href="javascript:goto_page(32)"> Resistors in Parallel </a>
-<li><a href="javascript:goto_page(33)"> A More Complex Circuit </a>
-</ul> <li><a href="javascript:goto_page(34)"> Intuitive Method of Circuit Analysis </a>
-<li><a href="javascript:goto_page(35)"> More Examples </a>
-<li><a href="javascript:goto_page(36)"> Dependent Sources and the Control Concept </a>
-<ul> <li><a href="javascript:goto_page(37)"> Circuits with Dependent Sources </a>
-</ul> <li><a href="javascript:goto_page(38)"> A Formulation Suitable for a Computer Solution * </a>
-<li><a href="javascript:goto_page(39)"> Summary </a>
-</ul> <li><a href="javascript:goto_page(40)"> Network Theorems </a>
-<ul> <li><a href="javascript:goto_page(41)"> Introduction </a>
-<li><a href="javascript:goto_page(42)"> The Node Voltage </a>
-<li><a href="javascript:goto_page(43)"> The Node Method </a>
-<ul> <li><a href="javascript:goto_page(44)"> Node Method: A Second Example </a>
-<li><a href="javascript:goto_page(45)"> Floating Independent Voltage Sources </a>
-<li><a href="javascript:goto_page(46)"> Dependent Sources and the Node Method </a>
-<li><a href="javascript:goto_page(47)"> The Conductance and Source Matrices *}</a>
-</ul> <li><a href="javascript:goto_page(48)"> Loop Method * </a>
-<li><a href="javascript:goto_page(49)"> Superposition </a>
-<ul> <li><a href="javascript:goto_page(50)"> Superposition Rules for Dependent Sources </a>
-</ul> <li><a href="javascript:goto_page(51)"> Th\'e}venin's Theorem and Norton's Theorem </a>
-<ul> <li><a href="javascript:goto_page(52)"> The Th\'e}venin Equivalent Network </a>
-<li><a href="javascript:goto_page(53)"> The Norton Equivalent Network </a>
-<li><a href="javascript:goto_page(54)"> More Examples </a>
-</ul> <li><a href="javascript:goto_page(55)"> Summary </a>
+
+<li><a href="javascript:goto_page(34)"> The Circuit Abstraction </a>
+<ul> <li><a href="javascript:goto_page(34)"> The Power of Abstraction </a>
+<li><a href="javascript:goto_page(36)"> The Lumped Circuit Abstraction</a>
+<li><a href="javascript:goto_page(40)"> The Lumped Matter Discipline </a>
+<li><a href="javascript:goto_page(44)"> Limitations of the Lumped Circuit Abstraction </a>
+<li><a href="javascript:goto_page(46)"> Practical Two-Terminal Elements </a>
+<ul> <li><a href="javascript:goto_page(47)"> Batteries </a>
+<li><a href="javascript:goto_page(49)"> Linear Resistors </a>
+<li><a href="javascript:goto_page(56)"> Associated Variables Convention </a>
+</ul> <li><a href="javascript:goto_page(60)"> Ideal Two-Terminal Elements </a>
+<ul> <li><a href="javascript:goto_page(61)"> Ideal Voltage Sources, Wires and Resistors </a>
+<li><a href="javascript:goto_page(63)"> Element Laws </a>
+<li><a href="javascript:goto_page(64)"> The Current Source</a>
+</ul> <li><a href="javascript:goto_page(67)"> Modeling Physical Elements </a>
+<li><a href="javascript:goto_page(71)"> Signal Representation </a>
+<ul> <li><a href="javascript:goto_page(72)"> Analog Signals</a>
+<li><a href="javascript:goto_page(73)"> Digital Signals</a>
+</ul> <li><a href="javascript:goto_page(77)"> Summary </a>
+
+</ul> <li><a href="javascript:goto_page(84)"> Resistive Networks </a>
+<ul> <li><a href="javascript:goto_page(85)"> Terminology </a>
+<li><a href="javascript:goto_page(86)"> Kirchhoff's Laws </a>
+<ul> <li><a href="javascript:goto_page(87)"> KCL </a>
+<li><a href="javascript:goto_page(91)"> KVL </a>
+</ul> <li><a href="javascript:goto_page(97)"> Circuit Analysis: Basic Method </a>
+<ul> <li><a href="javascript:goto_page(98)"> Single-Resistor Circuits </a>
+<li><a href="javascript:goto_page(101)"> Quick Intuitive Analysis of Single-Resistor Circuits </a>
+<li><a href="javascript:goto_page(102)"> Energy Conservation </a>
+<li><a href="javascript:goto_page(104)"> Voltage and Current Dividers </a>
+<li><a href="javascript:goto_page(106)"> Voltage Dividers </a>
+<li><a href="javascript:goto_page(107)"> Resistors in Series </a>
+<li><a href="javascript:goto_page(111)"> Current Dividers </a>
+<li><a href="javascript:goto_page(115)"> Resistors in Parallel </a>
+<li><a href="javascript:goto_page(115)"> A More Complex Circuit </a>
+</ul> <li><a href="javascript:goto_page(138)"> Intuitive Method of Circuit Analysis </a>
+<li><a href="javascript:goto_page(139)"> More Examples </a>
+<li><a href="javascript:goto_page(129)"> Dependent Sources and the Control Concept </a>
+<ul> <li><a href="javascript:goto_page(133)"> Circuits with Dependent Sources </a>
+</ul> <li><a href="javascript:goto_page(138)"> A Formulation Suitable for a Computer Solution * </a>
+<li><a href="javascript:goto_page(139)"> Summary </a>
+
+</ul> <li><a href="javascript:goto_page(150)"> Network Theorems </a>
+<ul> <li><a href="javascript:goto_page(150)"> Introduction </a>
+<li><a href="javascript:goto_page(150)"> The Node Voltage </a>
+<li><a href="javascript:goto_page(156)"> The Node Method </a>
+<ul> <li><a href="javascript:goto_page(161)"> Node Method: A Second Example </a>
+<li><a href="javascript:goto_page(166)"> Floating Independent Voltage Sources </a>
+<li><a href="javascript:goto_page(170)"> Dependent Sources and the Node Method </a>
+<li><a href="javascript:goto_page(176)"> The Conductance and Source Matrices *}</a>
+</ul> <li><a href="javascript:goto_page(176)"> Loop Method * </a>
+<li><a href="javascript:goto_page(176)"> Superposition </a>
+<ul> <li><a href="javascript:goto_page(183)"> Superposition Rules for Dependent Sources </a>
+</ul> <li><a href="javascript:goto_page(188)"> Th\'e}venin's Theorem and Norton's Theorem </a>
+<ul> <li><a href="javascript:goto_page(188)"> The Th\'e}venin Equivalent Network </a>
+<li><a href="javascript:goto_page(198)"> The Norton Equivalent Network </a>
+<li><a href="javascript:goto_page(202)"> More Examples </a>
+</ul> <li><a href="javascript:goto_page(208)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(56)"> Analysis of Nonlinear Circuits </a>
 <ul> <li><a href="javascript:goto_page(57)"> Introduction to Nonlinear Elements </a>
 <li><a href="javascript:goto_page(58)"> Analytical Solutions </a>
@@ -61,6 +65,7 @@
 <ul> <li><a href="javascript:goto_page(61)"> Improved Piecewise Linear Models for Nonlinear Elements * </a>
 </ul> <li><a href="javascript:goto_page(62)"> Incremental Analysis </a>
 <li><a href="javascript:goto_page(63)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(64)"> The Digital Abstraction </a>
 <ul> <li><a href="javascript:goto_page(65)"> Voltage Levels and the Static Discipline </a>
 <li><a href="javascript:goto_page(66)"> Boolean Logic </a>
@@ -69,6 +74,7 @@
 <li><a href="javascript:goto_page(69)"> Simplifying Logic Expressions * </a>
 <li><a href="javascript:goto_page(70)"> Number Representation </a>
 <li><a href="javascript:goto_page(71)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(72)"> The MOSFET Switch </a>
 <ul> <li><a href="javascript:goto_page(73)"> The Switch </a>
 <li><a href="javascript:goto_page(74)"> Logic Functions Using Switches </a>
@@ -87,6 +93,7 @@
 </ul> <li><a href="javascript:goto_page(87)"> Power Consumption in Logic Gates </a>
 <li><a href="javascript:goto_page(88)"> Active Pullups </a>
 <li><a href="javascript:goto_page(89)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(90)"> The MOSFET Amplifier </a>
 <ul> <li><a href="javascript:goto_page(91)"> Signal Amplification </a>
 <li><a href="javascript:goto_page(92)"> Review of Dependent Sources </a>
@@ -103,6 +110,7 @@
 </ul> <li><a href="javascript:goto_page(103)"> Operating Point Selection </a>
 <li><a href="javascript:goto_page(104)"> Switch Unified (SU) MOSFET Model $*$ </a>
 <li><a href="javascript:goto_page(105)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(106)"> The Small Signal Model </a>
 <ul> <li><a href="javascript:goto_page(107)"> Overview of the Nonlinear MOSFET Amplifier </a>
 <li><a href="javascript:goto_page(108)"> The Small Signal Model </a>
@@ -115,6 +123,7 @@
 <li><a href="javascript:goto_page(115)"> Current Gain </a>
 <li><a href="javascript:goto_page(116)"> Power Gain </a>
 </ul> <li><a href="javascript:goto_page(117)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(118)"> Energy Storage Elements </a>
 <ul> <li><a href="javascript:goto_page(119)"> Constitutive Laws </a>
 <ul> <li><a href="javascript:goto_page(120)"> Capacitors </a>
@@ -134,6 +143,7 @@
 <li><a href="javascript:goto_page(134)"> Role Reversal$*$ </a>
 </ul> <li><a href="javascript:goto_page(135)"> Energy, Charge and Flux Conservation </a>
 <li><a href="javascript:goto_page(136)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(137)"> First-order Transients </a>
 <ul> <li><a href="javascript:goto_page(138)"> Analysis of RC Circuits </a>
 <ul> <li><a href="javascript:goto_page(139)"> Parallel RC Circuit, Step Input </a>
@@ -169,6 +179,7 @@
 <li><a href="javascript:goto_page(169)"> Design of the Digital Memory Element </a>
 <li><a href="javascript:goto_page(170)"> A Static Memory Element </a>
 </ul> <li><a href="javascript:goto_page(171)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(172)"> Energy and Power in Digital Circuits </a>
 <ul> <li><a href="javascript:goto_page(173)"> Power and Energy Relations for a Simple RC Circuit </a>
 <li><a href="javascript:goto_page(174)"> Average Power in an RC Circuit </a>
@@ -188,6 +199,7 @@
 <li><a href="javascript:goto_page(188)"> CMOS NOR Gate </a>
 <li><a href="javascript:goto_page(189)"> Other Logic Functions </a>
 </ul> <li><a href="javascript:goto_page(190)"> Summary </a>
+
 </ul> <li><a href="javascript:goto_page(191)"> Transients in Second Order Circuits </a>
 <ul> <li><a href="javascript:goto_page(192)"> Undriven LC Circuit </a>
 <li><a href="javascript:goto_page(193)"> Undriven, Series RLC Circuit </a>
diff --git a/simplewiki_base.html b/simplewiki_base.html
index 714edf5a9b..a4f792b825 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -89,8 +89,8 @@
 
       <ul class="action">
         <li>
-    	            <div class="wiki_box_title">Search</div>
-    	        <form method="POST" action='${reverse("wiki_search_articles", args=[""])}'>
+    	        <div class="wiki_box_title">Search</div>
+    	        <form method="POST" action='${reverse("wiki_search_articles", args=[])}'>
     	            <div style="display:none">
                 	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
                 	</div>
@@ -99,8 +99,12 @@
     	        </form>
         </li>
         <li>
-          <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=["wiki_articleget_url"])}'" value="Random article" class="button" />
+          <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=[])}'" value="Random article" class="button" />
         </li>
+        <li>
+          <input type="button" onclick="javascript:location.href='${reverse("wiki_list_articles", args=[])}'" value="All articles" class="button" />
+        </li>
+        
 
         <li class="create-article">
           <h3>
diff --git a/simplewiki_error.html b/simplewiki_error.html
index f251f8d411..eb78521fb0 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -21,7 +21,7 @@ ${wiki_error}
 %if wiki_url is not UNDEFINED:
 <p>
 The page you requested could not be found.
-Click <a href="{% url wiki_create wiki_url %}">here</a> to create it.
+Click <a href="${reverse("wiki_create", args=[wiki_url])}">here</a> to create it.
 </p>
 %else:
 <p>
diff --git a/staticbook.html b/staticbook.html
index af3cade9cb..350e533e26 100644
--- a/staticbook.html
+++ b/staticbook.html
@@ -16,7 +16,7 @@ function goto_page(n) {
   if(n<10) {
     prefix="00";
   }
-  $("#bookpage").attr("src","/static/book/p"+prefix+n+".jpg");
+  $("#bookpage").attr("src","/static/book/small-p"+prefix+n+".jpg");
 };
 
 function prev_page() {
@@ -56,7 +56,7 @@ function next_page() {
           </ul>
         </nav>
 
-        <img id="bookpage" src="/static/book/p${ "%03i"%(page) }.jpg">
+        <img id="bookpage" src="/static/book/small-p${ "%03i"%(page) }.jpg">
       </section>
     </section>
   </div>