Fixing tables to actually work