Refactored charts panel