Upgraded markup and styles to using table markup