Changed the way tables are drawn