fix charts and table