rework html tables and dataBase