Charts/Ui: Improvements and fixes