Worked on SPIP painting
Optimized SPIP visualization

* Moved some funnel logic into FunnelUtil
* Now showing the completely computed next funnel at the end of
  each major step