diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index cedd7f642a..c5d99947dc 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -154,7 +154,7 @@ def index(request, course_id, chapter=None, section=None,
                 # Add a list of all the errors...
                 context['course_errors'] = modulestore().get_item_errors(course.location)
 
-        result = render_to_response('courseware.html', context)
+        result = render_to_response('courseware/courseware.html', context)
     except:
         # In production, don't want to let a 500 out for any reason
         if settings.DEBUG:
@@ -170,8 +170,9 @@ def index(request, course_id, chapter=None, section=None,
                               position=position
                               ))
             try:
-                result = render_to_response('courseware-error.html',
-                                            {'staff_access': staff_access})
+                result = render_to_response('courseware/courseware-error.html',
+                                            {'staff_access': staff_access,
+                                            'course' : course})
             except:
                 result = HttpResponse("There was an unrecoverable error")
 
@@ -215,7 +216,7 @@ def course_info(request, course_id):
     course = get_course_with_access(request.user, course_id, 'load')
     staff_access = has_access(request.user, course, 'staff')
 
-    return render_to_response('info.html', {'course': course,
+    return render_to_response('courseware/info.html', {'course': course,
                                             'staff_access': staff_access,})
 
 
@@ -288,7 +289,7 @@ def progress(request, course_id, student_id=None):
                }
     context.update()
 
-    return render_to_response('progress.html', context)
+    return render_to_response('courseware/progress.html', context)
 
 
 
@@ -316,7 +317,7 @@ def gradebook(request, course_id):
                      }
                      for student in enrolled_students]
 
-    return render_to_response('gradebook.html', {'students': student_info,
+    return render_to_response('courseware/gradebook.html', {'students': student_info,
                                                  'course': course,
                                                  'course_id': course_id,
                                                  # Checked above
@@ -331,7 +332,7 @@ def grade_summary(request, course_id):
     # For now, just a static page
     context = {'course': course,
                'staff_access': True,}
-    return render_to_response('grade_summary.html', context)
+    return render_to_response('courseware/grade_summary.html', context)
 
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
@@ -342,5 +343,5 @@ def instructor_dashboard(request, course_id):
     # For now, just a static page
     context = {'course': course,
                'staff_access': True,}
-    return render_to_response('instructor_dashboard.html', context)
+    return render_to_response('courseware/instructor_dashboard.html', context)
 
diff --git a/lms/templates/course_navigation.html b/lms/templates/courseware/course_navigation.html
similarity index 100%
rename from lms/templates/course_navigation.html
rename to lms/templates/courseware/course_navigation.html
diff --git a/lms/templates/courseware-error.html b/lms/templates/courseware/courseware-error.html
similarity index 67%
rename from lms/templates/courseware-error.html
rename to lms/templates/courseware/courseware-error.html
index 3c26ae8aeb..169c7de8bc 100644
--- a/lms/templates/courseware-error.html
+++ b/lms/templates/courseware/courseware-error.html
@@ -1,8 +1,13 @@
-<%inherit file="main.html" />
+<%inherit file="/main.html" />
+<%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – edX</title></%block>
 
-<%include file="course_navigation.html" args="active_page='courseware'" />
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
+<%include file="/courseware/course_navigation.html" args="active_page='courseware'" />
 
 <section class="container">
   <section class="outside-app">
diff --git a/lms/templates/courseware.html b/lms/templates/courseware/courseware.html
similarity index 86%
rename from lms/templates/courseware.html
rename to lms/templates/courseware/courseware.html
index 92c6c9707c..e1d6d11f37 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -1,7 +1,7 @@
-<%inherit file="main.html" />
-<%namespace name='static' file='static_content.html'/>
+<%inherit file="/main.html" />
+<%namespace name='static' file='/static_content.html'/>
 <%block name="bodyclass">courseware</%block>
-<%block name="title"><title>Courseware – MITx 6.002x</title></%block>
+<%block name="title"><title>${course.number} Courseware</title></%block>
 
 <%block name="headextra">
   <%static:css group='course'/>
@@ -21,7 +21,7 @@
 
    <%static:js group='courseware'/>
 
-  <%include file="mathjax_include.html" />
+  <%include file="/mathjax_include.html" />
 
   <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
   <script type="text/javascript">
@@ -30,7 +30,7 @@
   </script>
 </%block>
 
-<%include file="course_navigation.html" args="active_page='courseware'" />
+<%include file="/courseware/course_navigation.html" args="active_page='courseware'" />
 
 <section class="container">
   <div class="course-wrapper">
diff --git a/lms/templates/grade_summary.html b/lms/templates/courseware/grade_summary.html
similarity index 61%
rename from lms/templates/grade_summary.html
rename to lms/templates/courseware/grade_summary.html
index 3fdcd910ae..e5f91d9ddf 100644
--- a/lms/templates/grade_summary.html
+++ b/lms/templates/courseware/grade_summary.html
@@ -1,8 +1,8 @@
-<%inherit file="main.html" />
+<%inherit file="/main.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 
-<%include file="course_navigation.html" args="active_page=''" />
+<%include file="/courseware/course_navigation.html" args="active_page=''" />
 
 <section class="container">
 <div class="gradebook-summary-wrapper">
diff --git a/lms/templates/gradebook.html b/lms/templates/courseware/gradebook.html
similarity index 94%
rename from lms/templates/gradebook.html
rename to lms/templates/courseware/gradebook.html
index 5cb4e12701..20426041c4 100644
--- a/lms/templates/gradebook.html
+++ b/lms/templates/courseware/gradebook.html
@@ -1,6 +1,6 @@
-<%inherit file="main.html" />
+<%inherit file="/main.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 
 <%block name="js_extra">
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
@@ -28,7 +28,7 @@
 
 </%block>
 
-<%include file="course_navigation.html" args="active_page=''" />
+<%include file="/courseware/course_navigation.html" args="active_page=''" />
 
 <section class="container">
 <div class="gradebook-wrapper">
diff --git a/lms/templates/info.html b/lms/templates/courseware/info.html
similarity index 83%
rename from lms/templates/info.html
rename to lms/templates/courseware/info.html
index a04e31896f..33195f985e 100644
--- a/lms/templates/info.html
+++ b/lms/templates/courseware/info.html
@@ -1,11 +1,13 @@
-<%inherit file="main.html" />
-<%namespace name='static' file='static_content.html'/>
+<%inherit file="/main.html" />
+<%namespace name='static' file='/static_content.html'/>
 
 <%block name="headextra">
   <%static:css group='course'/>
 </%block>
 
-<%include file="course_navigation.html" args="active_page='info'" />
+<%block name="title"><title>${course.number} Course Info</title></%block>
+
+<%include file="/courseware/course_navigation.html" args="active_page='info'" />
 <%! 
   from courseware.courses import get_course_info_section
 %>
diff --git a/lms/templates/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
similarity index 74%
rename from lms/templates/instructor_dashboard.html
rename to lms/templates/courseware/instructor_dashboard.html
index 6b87f63031..9508624f9b 100644
--- a/lms/templates/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -1,12 +1,12 @@
-<%inherit file="main.html" />
+<%inherit file="/main.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%namespace name='static' file='static_content.html'/>
+<%namespace name='static' file='/static_content.html'/>
 
 <%block name="headextra">
   <%static:css group='course'/>
 </%block>
 
-<%include file="course_navigation.html" args="active_page='instructor'" />
+<%include file="/courseware/course_navigation.html" args="active_page='instructor'" />
 
 <section class="container">
 <div class="instructor-dashboard-wrapper">
diff --git a/lms/templates/progress.html b/lms/templates/courseware/progress.html
similarity index 85%
rename from lms/templates/progress.html
rename to lms/templates/courseware/progress.html
index 6b01e5896d..86649a2e91 100644
--- a/lms/templates/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -1,13 +1,13 @@
-<%inherit file="main.html" />
-<%namespace name='static' file='static_content.html'/>
+<%inherit file="/main.html" />
+<%namespace name='static' file='/static_content.html'/>
 
 <%block name="headextra">
   <%static:css group='course'/>
 </%block>
 
-<%namespace name="profile_graphs" file="profile_graphs.js"/>
+<%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
 
-<%block name="title"><title>Progress - edX 6.002x</title></%block>
+<%block name="title"><title>${course.number} Progress</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse
@@ -18,11 +18,11 @@
 <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
 <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script>
 <script>
-${profile_graphs.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")}
+${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")}
 </script>
 </%block>
 
-<%include file="course_navigation.html" args="active_page='progress'" />
+<%include file="/courseware/course_navigation.html" args="active_page='progress'" />
 
 <section class="container">
   <div class="profile-wrapper">
@@ -81,9 +81,5 @@ ${profile_graphs.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")
       </ol> <!--End chapters-->
 
     </section>
-
-    <section aria-label="Profile Navigation" class="user-info">
-      
-    </section>
   </div>
 </section>
diff --git a/lms/templates/profile_graphs.js b/lms/templates/courseware/progress_graph.js
similarity index 100%
rename from lms/templates/profile_graphs.js
rename to lms/templates/courseware/progress_graph.js
diff --git a/lms/templates/gradebook_profilegraphs.html b/lms/templates/gradebook_profilegraphs.html
deleted file mode 100644
index fc36c84fb8..0000000000
--- a/lms/templates/gradebook_profilegraphs.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<%inherit file="main.html" />
-<%namespace name='static' file='static_content.html'/>
-<%namespace name="profile_graphs" file="profile_graphs.js"/>
-
-<%block name="js_extra">
-  <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script>
-  % for s in students:
-  <script>
-    ${profile_graphs.body(s['grade_info']['grade_summary'], "grade-detail-graph-" + str(s['id']))}
-  </script>
-  %endfor
-</%block>
-
-<%include file="navigation.html" args="active_page=''" />
-<section class="container">
-<div class="gradebook-wrapper">
-  <section class="gradebook-content">
-    <h1>Gradebook</h1>
-    <ol>
-      % for s in students:
-      <li>
-        <h2><a href=/profile/${s['id']}>${s['username']}</a></h2>
-        <div id="grade-detail-graph-${s['id']}" style="width:1000px;height:300px;"></div>
-      </li>
-      % endfor
-    </ol>
-  </section>
-</div>
-</section>
diff --git a/lms/templates/simplewiki/simplewiki_base.html b/lms/templates/simplewiki/simplewiki_base.html
index 8736f3e421..e19d8d61ca 100644
--- a/lms/templates/simplewiki/simplewiki_base.html
+++ b/lms/templates/simplewiki/simplewiki_base.html
@@ -79,7 +79,7 @@
 <%block name="bodyextra">
 
 %if course:
-<%include file="../course_navigation.html" args="active_page='wiki'" />
+<%include file="/courseware/course_navigation.html" args="active_page='wiki'" />
 %endif
 
 <section class="container">
diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html
index 2a0a6f03bb..f9d6ff109c 100644
--- a/lms/templates/staticbook.html
+++ b/lms/templates/staticbook.html
@@ -61,7 +61,7 @@ $("#open_close_accordion a").click(function(){
 </script>
 </%block>
 
-<%include file="course_navigation.html" args="active_page='book'" />
+<%include file="/courseware/course_navigation.html" args="active_page='book'" />
 
 <section class="container">
   <div class="book-wrapper">
diff --git a/lms/templates/wiki/base.html b/lms/templates/wiki/base.html
index 2c1943e2a5..d4428da466 100644
--- a/lms/templates/wiki/base.html
+++ b/lms/templates/wiki/base.html
@@ -47,7 +47,7 @@
 
 {% block body %}
   {% if course %}
-    {% include "course_navigation.html" with active_page_context="wiki" %}
+    {% include "courseware/course_navigation.html" with active_page_context="wiki" %}
   {% endif %}
 
   <section class="container wiki {{ selected_tab }}">