Prettied up table. Removed some markup and made it more logical.