Revert "Temp workaround for delete activities after merge"

This reverts commit 8f7573f3662569560f7bd2e2008169dc48e2b17a.
Merge back from maiera
Changed how data for the charts are updated for #154
Minor UI updates on Charts for #146
Merge pull request #155 from SmokyBob/feature/material_design

Merge fixes for Issue #154 and #146