diff --git a/main.html b/main.html
index fe74e8e81f..a3bc73e1a6 100644
--- a/main.html
+++ b/main.html
@@ -3,16 +3,16 @@
 <head>
   <%block name="title"><title>MITX 6.002</title></%block>
 
-  <link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
+  <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
   <link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
   <link href="/static/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
   <link href="/static/css/print.css" rel="stylesheet" type="text/css" media="print"/>
 
-  <script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
-  <script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
-  <script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
-  <script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
-  <script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery.leanModal.min.js"></script>
   <script type="text/javascript" src="/static/js/video_player.js"></script>
   <script type="text/javascript" src="/static/js/schematic.js"></script>
   <script type="text/javascript" src="/static/js/cktsim.js"></script>
@@ -27,7 +27,7 @@
       displayMath: [["\\[","\\]"]]}
     });
   </script>
-  <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
 
   <script type="text/javascript">
     $(function(){
diff --git a/marketing.html b/marketing.html
index 20063d0b85..a05246a67d 100644
--- a/marketing.html
+++ b/marketing.html
@@ -3,15 +3,15 @@
 <head>
   <%block name="title"><title>MITX 6.002</title></%block>
 
-  <!--link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" /-->
+  <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
   <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
 
-  <script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
-  <script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
 
-  <script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
-  <!--script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script-->
-  <!--script type="text/javascript" src="/static/lib/jquery.treeview.js"></script-->
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery.leanModal.min.js"></script>
+  <!--script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script-->
+  <!--script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script-->
   <!--script type="text/javascript" src="/static/js/video_player.js"></script-->
   <!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
 
@@ -61,12 +61,15 @@ function postJSON(url, data, callback) {
   <%block name="header">
   <header class="announcement <%block name="header_class"/>">
     <div class="anouncement-wrapper">
+% if settings.COURSEWARE_ENABLED:
     <%block name="header_nav">
     <nav>
       <h1><a href="http://mitx.mit.edu/">MITx</a></h1>
       <a rel="leanModal" class="login" href="#login">Log In</a>
     </nav>
     </%block>
+% endif
+
     <%block name="header_text">
       <section>
         <h1>MITx</h1>
diff --git a/simplewiki_base.html b/simplewiki_base.html
index d4270c9752..f73c63218e 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -42,7 +42,7 @@
       tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
                 displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
     });
-  </script> <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> 
+  </script> <script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> 
   <script>
   $(function(){
   $.ajaxSetup ({
diff --git a/staticbook.html b/staticbook.html
index af3cade9cb..46348a1441 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","${ settings.BOOK_URL }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="${ settings.BOOK_URL }p${ "%03i"%(page) }.jpg">
       </section>
     </section>
   </div>
