Added container view controller for stream and schedule, other changes and improvements