Refactor river controller
ng-if in river template
Toggle info on catches