fixed formatting on the courses/show page

Also had to fix some merge conflicts in teachers/courses/show view and teachers/live_view controller.  Please give these a close look before merging!