Updating criteria section to use tables for laying out the comparison.

Work in progress.

Consider moving each section into its own file.