@@ -1,6 +1,6 @@
 {% extends "basic/layout.html" %}
 
-{% set script_files = script_files + [
+{% set script_files = ['_static/runestonebase.js'] + script_files + [
     '_static'+'/jquery-ui-1.10.3.custom.min.js',
     '_static'+'/jquery-fix.js',
     '_static'+'/bootstrap-3.0.0/js/bootstrap.min.js',
@@ -83,12 +83,6 @@
                 <div>
                   <b>Help support us:</b>
                 </div>
-                <div class="gittip">
-                  <iframe style="border:0;"
-                    src="https://www.gittip.com/bnmnetp/widget.html"
-                    width="48pt" height="22pt" class="gittip-button">
-                  </iframe>
-                </div>
                 <div>
                     <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
                   <input type="hidden" name="cmd" value="_s-xclick">
@@ -112,14 +106,14 @@
             <i class="glyphicon glyphicon-search" style='opacity:0.9;'></i>
           </a>
           <ul class='dropdown-menu'>
-            {% if 'overview' in course_id: %}
+            {% if 'overview' in course_id %}
                 <li><a href='/{{appname}}/static/{{course_id}}/overview.html'>Table of Contents</a></li>
             {% else: %}
                 <li><a href='{{ pathto(master_doc) }}'>Table of Contents</a></li>
             {% endif %}
             <li><a href='/{{appname}}/static/{{course_id}}/genindex.html'>Book Index</a></li>
             <li class="divider"></li>
-            <li id="scratch_ac_link"><a href="javascript:toggleScratchActivecode()">Scratch ActiveCode</a></li>
+            <li id="scratch_ac_link"><a href="javascript:ACFactory.toggleScratchActivecode()">Scratch ActiveCode</a></li>
             <li class="divider"></li>
             <li style="width: 240px;">
               <form class="navbar-search" style="margin:10px;" action="{{ pathto('search') }}" method="get">
@@ -141,6 +135,7 @@
 
         <li class="divider-vertical"></li>
 
+        {% if use_services == 'true' %}
         <!-- user account dropdown -->
         <li class="dropdown">
           <a class="dropdown-toggle" href="#" data-toggle="dropdown">
@@ -149,6 +144,8 @@
           <ul class="dropdown-menu user-menu">
             <li><span class='loggedinuser'></span></li>
             <li class="divider"></li>
+            <li><a href='/{{appname}}/default/courses'>Change Course</a></li>
+            <li class="divider"></li>
             <li><a href='{{course_url}}/{{appname}}/mygroup/initiateGroup' id="joinGroupLink">Join a Study Group</a></li>
             <li><a href='{{course_url}}/{{appname}}/mygroup/schedule' id="groupScheduleLink">Group Schedule</a></li>
             <li><a href='{{course_url}}/{{appname}}/mygroup/newschedule' id="newChapterLink">Schedule New Chapter</a></li>
@@ -164,7 +161,7 @@
           </ul>
         </li>
         <!-- end user account dropdown -->
-
+        {% endif %}
         <li class="divider-vertical"></li>
 
         <!-- help menu dropdown -->
@@ -177,7 +174,7 @@
             <li><a href='/{{appname}}/static/overview/instructor.html'>Help for Instructors</a></li>
             <li class="divider"></li>
             <li><a href='http://runestoneinteractive.org'>About Runestone</a></li>
-            <li><a href='https://github.com/bnmnetp/runestone/issues/new'>Report A Problem</a></li>
+            <li><a href='/{{ appname }}/default/reportabug?course={{ course_id }}&page={{ pathto(pagename,1) }}'>Report A Problem</a></li>
           </ul>
         </li>
         <!-- end help menu dropdown -->
@@ -209,16 +206,22 @@
 <meta charset='utf-8'>
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
 <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
+<link rel="shortcut icon" href="/{{appname}}/static/favicon.ico" type="image/ico" />
+
 <script type="text/javascript">
   eBookConfig = {};
   eBookConfig.host = '{{course_url}}' ? '{{course_url}}' : 'http://127.0.0.1:8000';
   eBookConfig.app = eBookConfig.host+'/{{appname}}';
   eBookConfig.ajaxURL = eBookConfig.app+'/ajax/';
   eBookConfig.course = '{{course_id}}';
   eBookConfig.logLevel = {{loglevel}};
-  eBookConfig.loginRequired = {{login_required}}
+  eBookConfig.loginRequired = {{login_required}};
   eBookConfig.build_info = "{{build_info}}";
   eBookConfig.isLoggedIn = false;
+  eBookConfig.useRunestoneServices = {{ use_services }};
+  eBookConfig.python3 = {{ python3 }};
+  eBookConfig.basecourse = '{{ basecourse }}';
+  eBookConfig.runestone_version = '{{ runestone_version }}';
 </script>
 
 <div id="fb-root"></div>
@@ -260,7 +263,10 @@
 <footer class="footer">
   <div class="container">
     <p class="pull-right">
-      <span id='numuserspan'></span> readers online now | <span class='loggedinuser'></span> | <a href="#">Back to top</a>
+      {% if use_services == 'true' %}
+      <span id='numuserspan'></span> readers online now | <span class='loggedinuser'></span>
+      {% endif %}
+      | <a href="#">Back to top</a>
       {% if theme_source_link_position == "footer" %}
         <br />
         {% include "sourcelink.html" %}
@@ -278,12 +284,13 @@
       {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}<br/>
     {%- endif %}
     {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://runestoneinteractive.org/">Runestone</a> {{ runestone_version }}.{% endtrans %}
     {%- endif %}
     </p>
   </div>
 </footer>
 
+
 {% if appname == "runestone" %}
 <script type="text/javascript">
   var _gaq = _gaq || [];