wip: moved charts to widgets, tidied up but charts are still broken.