Changed from table to li.
Some simplification.
Check that values are good, properly.