Fixing sorting in stream page
Fixing conflicts in stream.html