Changes to streamflow page, lots of refactoring from yesterday