Cleaned the tables

Cleaned some of the markup and corrected the code for the tag tables