Refactored waterfall view