Waterfall redesign

Related: https://github.com/GigaOM/gigaom/pull/6028