Untangle course content container

refs #510.