Added nonCourse Items and noCourses to the data model and fixed various
drawing bugs