Removed old table, fixed js issues