Refactor/update waste count view