fix charts, reorder javascript tags