Refactoring to support clear/save stream btns

They're now part of the stream view which makes a lot more sense!