Laid out the list into a table and fixed a bug