Waterfall hover-state/interactivity improvements