Leon - review comments

- changes to Last 7 days and 30 days logic
- resolved graph x-axis label issue