refactored charts and dashboard