Index: openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.tcl	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.tcl	14 Sep 2016 10:43:00 -0000	1.1.2.2
@@ -4,6 +4,9 @@
 set i     [$page set __last_includelet]
 #$package_id log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
 
+set book_prev_link ""
+set book_next_link ""
+
 # prevent recursive books
 if {$i ne "" && ![$page exists __is_book_page]} {
   set p     [$i position]
Index: openacs-4/packages/xowiki/resources/templates/view-book.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-book.tcl	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-book.tcl	14 Sep 2016 10:43:00 -0000	1.1.2.2
@@ -3,6 +3,9 @@
 set i     [$page set __last_includelet]
 #$package_id log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
 
+set book_prev_link ""
+set book_next_link ""
+
 # prevent recursive books
 if {$i ne "" && ![$page exists __is_book_page]} {
   set p     [$i position]
Index: openacs-4/packages/xowiki/resources/templates/view-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-page.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/view-page.adp	14 Sep 2016 10:22:12 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/view-page.adp	14 Sep 2016 10:43:00 -0000	1.1.2.3
@@ -9,7 +9,7 @@
 %>
 
 <div>
-  <div style='top: -00px ! important; margin-bottom: 25px ! important;' id='wikicmds'>
+  <div style='top: -30px ! important; margin-bottom: 25px ! important;' id='wikicmds'>
     <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
       <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
@@ -26,7 +26,7 @@
       </div>
     </div>
   </div>
-  @top_includelets;noquote@
+<!--  @top_includelets;noquote@ -->
   <if @page_title@ not nil>
     <h2>@page_title@</h2>
   </if>