diff --git a/app/templates/courses/student-courses-view.jade b/app/templates/courses/student-courses-view.jade
index 609ce3bc7..55c471d33 100644
--- a/app/templates/courses/student-courses-view.jade
+++ b/app/templates/courses/student-courses-view.jade
@@ -20,12 +20,28 @@ block content
       
     if view.state === 'unknown_error'
       .alert.alert-danger= view.stateMessage
+    
+    - var justJoinedCourseInstance = view.courseInstances.find(function(ci) { return ci.justJoined; });
+    if justJoinedCourseInstance
+      - var course = view.courses.get(justJoinedCourseInstance.get('courseID'));
+      - var classroom = view.classrooms.get(justJoinedCourseInstance.get('classroomID'));
+      if course && classroom
+        .alert.alert-info
+          span.spr Successfully joined "#{classroom.get('name')}"!
+          a(href="/courses/#{course.id}/#{justJoinedCourseInstance.id}") 
+            strong Click here to start taking "#{course.get('name')}".
      
   .panel.panel-default
     .panel-heading
       .panel-title My Courses
       
     .list-group
+      .list-group-item
+        .row
+          .col-sm-3
+            strong Classroom
+          .col-sm-3
+            strong Course
       for courseInstance in view.courseInstances.models
         - var classroom = view.classrooms.get(courseInstance.get('classroomID'))
         - var course = view.courses.get(courseInstance.get('courseID'))
diff --git a/app/views/courses/StudentCoursesView.coffee b/app/views/courses/StudentCoursesView.coffee
index 711eef7b8..bd9c1f928 100644
--- a/app/views/courses/StudentCoursesView.coffee
+++ b/app/views/courses/StudentCoursesView.coffee
@@ -22,6 +22,7 @@ module.exports = class StudentCoursesView extends RootView
   constructor: (options) ->
     super(options)
     @courseInstances = new CocoCollection([], { url: "/db/user/#{me.id}/course_instances", model: CourseInstance})
+    @courseInstances.comparator = (ci) -> return ci.get('classroomID') + ci.get('courseID')
     @supermodel.loadCollection(@courseInstances, 'course_instances')
     @classrooms = new CocoCollection([], { url: "/db/classroom", model: Classroom })
     @supermodel.loadCollection(@classrooms, 'classrooms', { data: {memberID: me.id} })
@@ -85,6 +86,7 @@ module.exports = class StudentCoursesView extends RootView
             context: @
             success: (data) ->
               @courseInstances.add(data)
+              @courseInstances.get(data._id).justJoined = true
           })
       $.when(jqxhrs...).done =>
         @state = ''