Reorganized init_tables, updated some chart js