update to stream page
Merge remote-tracking branch 'origin/feature/streampage' into staging