A bit more clean up after charts -> panels