Changed layout from tables to lists