JS changes for stream page
More JW fixes