Refactor layout.  Add donut chart.