diff --git a/app/styles/courses/change-course-language-modal.sass b/app/styles/courses/change-course-language-modal.sass
new file mode 100644
index 000000000..eabcc4765
--- /dev/null
+++ b/app/styles/courses/change-course-language-modal.sass
@@ -0,0 +1,3 @@
+#change-course-language-modal
+  p
+    margin: 30px 0
\ No newline at end of file
diff --git a/app/templates/courses/change-course-language-modal.jade b/app/templates/courses/change-course-language-modal.jade
index 7ec0bbbc5..d7a7382c0 100644
--- a/app/templates/courses/change-course-language-modal.jade
+++ b/app/templates/courses/change-course-language-modal.jade
@@ -1,6 +1,7 @@
 extends /templates/core/modal-base
 
 block modal-header-content
+  h3 Change Course Language
   .clearfix
 
 block modal-body-content
@@ -14,12 +15,12 @@ block modal-body-content
         
     p - OR -
     
-    if currentLanguage === 'javascript'
-      button.lang-choice-btn.btn.btn-default(data-language='javascript')
-        if currentLanguage === 'javascript'
-          | Keep Using JavaScript
-        else
-          | Switch to JavaScript
+    button.lang-choice-btn.btn.btn-default(data-language='javascript')
+      if currentLanguage === 'javascript'
+        | Keep Using JavaScript
+      else
+        | Switch to JavaScript
+        
   #saving-progress.progress.progress-striped.active.hide
     .progress-bar(style="width: 100%")
 
diff --git a/app/templates/courses/courses-view.jade b/app/templates/courses/courses-view.jade
index 334fc72f5..8380cbae7 100644
--- a/app/templates/courses/courses-view.jade
+++ b/app/templates/courses/courses-view.jade
@@ -32,7 +32,7 @@ block content
         - var course = view.courses.get(view.hocCourseInstance.get('courseID'));
         - var campaign = view.campaigns.get(course.get('campaignID'));
         - var stats = campaign.statsForSessions(view.hocCourseInstance.sessions);
-        - showHOCComplete = stats.levels.done && !view.classrooms.size();
+        - showHOCComplete = stats.levels.done;
         
       .text-center
         if !showHOCComplete
@@ -46,7 +46,7 @@ block content
             li Learn even more programming!
           a.btn.btn-lg.btn-success(href="/play") Play Now
       
-      if view.hocCourseInstance && !view.classrooms.size()
+      if view.hocCourseInstance
         h3 Saved Games
         hr
         
diff --git a/app/views/courses/CoursesView.coffee b/app/views/courses/CoursesView.coffee
index eb0ddf4f6..9196d89c2 100644
--- a/app/views/courses/CoursesView.coffee
+++ b/app/views/courses/CoursesView.coffee
@@ -148,4 +148,5 @@ module.exports = class CoursesView extends RootView
         
   onClickChangeLanguageLink: ->
     modal = new ChangeCourseLanguageModal()
-    @openModalView(modal)
\ No newline at end of file
+    @openModalView(modal)
+    modal.once 'hidden', @render, @
\ No newline at end of file