Improve stacked graph

Improved stacked graph as per design: https://www.pivotaltracker.com/file_attachments/22427080/download?inline=true

Includes quite a bit of refactoring.