Small changes

Also some pretty significant changes to views for streams (partials).