Fixed some bugs where when the watch and listen button were clicked it would still show the transcript.  Also if there is no transcript it will default on the discuss tab.
Fixed conflicts