Added better data tables, fixed datetime display