Refactored functions in views/marble
Tiny refactor in controllers/streams